gentoo auto-resync : 13:07:2022 - 07:36:05

author: V3n3RiX <venerix@koprulu.sector> 2022-07-13 07:36:05 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-13 07:36:05 +0100
commit: 5c0c70d5917e66743293789a6d6fd7d72250eb32 (patch)
tree: f6738b2393c696bb8b19bd6ff0e52aafadf65101
parent: c5806fcd6b740ecbd62f4fb2e09d8c8dfa2966fc (diff)
176 files changed, 3988 insertions, 128 deletions
diff --git a/Manifest b/Manifest
index 27359de18e2f..9561416c37b3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29615 BLAKE2B be7d48b760cc770066ddedc1fa108a32b883baebf1f2b6a2c69c1bba30aa2f112058675317148b58f5652a6d6519d90e4d18834ed9c869e9598df9eca0ddc58c SHA512 6ccc2b27364b7117808e12adf5c1316627f24091eb1eabf636a42645c965c0b326bbb3510c3da0d279e6ef254d7fcace1ecd97e1a08445974d0949b294e3689d
-TIMESTAMP 2022-07-12T23:39:52Z
+MANIFEST Manifest.files.gz 29633 BLAKE2B 53814652550988c901fe0de60a44aed890bb0dce232643d8b99fdf10f17bfae2c1ffd37c9cddd8b6640868ff27f58ed710b031cd97bcd79f2f494bc01a5b3049 SHA512 e40c1025d0088230c638c179e1a65be398bb21af97a9054036356919f920ada2b91a752dc2ad0c982ae9dd602995bbff726954192d948f01b5b190e92a878c92
+TIMESTAMP 2022-07-13T05:39:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOBkhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOWqZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBQ9A//VUfODOKY3GrPyMuWM3pH+Hp5A8TaH4UiZltjbcWhdsSON652uVDdfoRv
-WQFL+peI7PNjugE5V8N95Wys+fkSlEUxVUOLBa2rQPWEyr9Lim1RVpJ0JAYPXXPU
-m/BsVv2gH0lqMgh1YaooI0pc7EzBXYIGFUY4GA1O9H1YDCHJZISSbCiTvQyd6stm
-Dl6HvuQfFJs4LEMrYVJ+E2YkzhNd5wsHSexod/Ne01GutB5yBMMGpnakSWL0J8EL
-1wZ+W0exYNUvhxM42zB4u6xsYHvuOfWPMj8AvnX+hQCIkQPmch/Got0rXvq9GFS3
-RWDBN63hR4TF2TZvH18psWP8XtYUFMkFCCZDvViTv/Y8xAIvPq7sbvK4iY8UmkeI
-b+/hZ5KCzjqWXz+OylS5AjPmkNSEvimLCENeGeUDs5bRuV99vRJWIn/dlHlba2cg
-3B/l3r2i/p+sZpZyySykxSM19n5TAlsCxLYteedPGyH/CHAtawvgLLvV7V8xkkhH
-WHs+fvcNsx1vEXzkblhrUh6DBal7j8xXyRxrSYr2+NaxwkWwb5OOOIPZx1Xh/T6x
-IeGM6ulpptIU0dMbah2YR/jgy/5aG7vukPjj2pw7JV/ROd1i+3ZBi0pyKvV1qrnc
-3SCOjxhBVykjEcEFB/IbmO3LPi6fupbwAWgeEBiH/Jj1wshagck=
-=iHSl
+klAzsBAAg/FAYGU6JEcdNaQwTsI9z7nWa9ZXGgWtIAhn8lX23VCSaEWSowyTLW8/
+WfqrPd99GKBMQSi9N3o/HqYu2xnks57w2cZJ+857pHmIJI5i4v9bryhFztC31Mky
+j8u1Dw2Fz2JAABbKkb+iWdhI0UMsPtFemDJOBKNAt5+kCli2OS5SbZrYjxh+P1ze
+Fld7qzlpDUz6GmBC7rq6bKzMJsvOS0v1U80iQgBU+WeNwQg8BIiFegeYcjcEyRks
+t7/A9FZN/xowL09Fm7fP07doTw2zMbVvYWhB7h0tn3o+gY2KWXtYFiFr0IA7pqNn
+CDri6RKWzolIAgM6M2YfnNVj8Gqvo4QS6acIQDMfJXTeLKp6ODTTHslSDNxO7Bm4
+QNVgBfzp4tuQY8mgu6BCaV4uU8QrMJLy2KzbH4XBri+LAp3eS2d7+QTQZOT6Dgdt
+2U3V06aacWVbCsLcNAwe45peOYvDro0RMlH2nemRSU6IjJz5M9o6OvqLh03Pfqe9
+ASnJksiCoKehOXtZtHwop4qD6ekZC70My9bEnMnbuxSvgySFXp8SD1t60FP+yToa
+O6EQE+7/w2yEQYkGMvWuLrle51jeCPN8hpC7hivvtmQUuN158qSpFj4cQhE4nLeu
+hHu6RJvr0pXD2AkYXSkRVrAjWXehO9u6+USA1+kghEJX4T7dCDs=
+=MamS
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1565a69d3b38..95f8a44c5cb0 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 9e28048de854..08a5a7d84fa0 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 30da773299f1..8557216cf7e9 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,4 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
 DIST appliance-1.46.0.tar.xz 145436856 BLAKE2B d9ed31f533a2772b0f506176b39bfdfdec1421fe4ff7934ccdb1db0cb2644d477211ec1a2d372d7e5dd0a8f278f47a39bff813b7bc4c9a038258a5f6358b4e91 SHA512 842119bdf95dbbd61328891e9bd0b557bed90ba79c6419ee18d1a79cd4a301ea6922339b9e80ac314ff3e16498e9d3c594861aebe8e0fc2db41d285eb8e5d578
-EBUILD libguestfs-appliance-1.46.0.ebuild 1273 BLAKE2B 1bbd1c3695ccb8dce8fc400d76960e0bcf704f4d2eec159a8a1be6f3eaf039237abfef2cf091676d51acbda019e3f0659426c28f807f61050356ff9ed8a8e34d SHA512 6ab5aee5bedabc46fa5a70475bb022a3204989a5e9d8b9e68a513b5bb0f4c897802c1b1a3911ec83951141827198123a4e510e24f394635eedb19a28c06cbce4
+EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 36f766718f99957d37c1e31a4737691877dae34309e0d42cebaf2e034c9d7bc719bdfbd3519bfcf9e227e302825c388ccd3dd7ec1b53253bf149d14a08f4e5fe SHA512 aae2a30862927485f5e8f4a1b72007442e2c3b8b88988321dd0dbc12ebc315cd1489393e9ef6e9cf8c7f6fb4b764174815b8373997f4387f9b7edeb1fe67b6df
 MISC metadata.xml 358 BLAKE2B 5c53a4234d111074211770ddf29787389265ae3d1c4b9df049fbe9866eaf6d21d567f3174a1d7cf609f6058587fcc82baec92a89cbb77bc7223d4fdeccbe7905 SHA512 d6a65ffa0ef14230ff77b36edb0885781820f0be0a5ba915e805669539478cbd9cdf89532d621336a9189c443a3b9399d47502fdd87993ae0167eada9e95afee
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
index a528cf39d52f..74e8430766b5 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-# Bump with app-emulation/libguestfs and app-emulation/libguestfs (if any new release there)
+# Bump with app-emulation/libguestfs and app-emulation/guestfs-tools (if any new release there)
 
 CHECKREQS_DISK_USR=500M
 CHECKREQS_DISK_BUILD=500M
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 3d6d40c5c529..b9acc31ade55 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,6 +1,8 @@
 AUX 1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch 991 BLAKE2B 213bea03f22a03f6cd7a82d310fcd106c1b06493e744a7bfb95b7820fe7813208e343170cf9d4322180528ea9e05ab94d54b1ba601bd0550388a33b1bf222211 SHA512 344729229c35e66d21911ae040b4a15ce9a5b37de0f1965272de1c85f21d3293182bbb7953cdd99bb8fe7909754ae462c5d7e973d369ff6d0b64c590fc1d2ee8
 DIST libguestfs-1.48.0.tar.gz 18426132 BLAKE2B a0ace19998e6eb368fa8ad73242b7c35c72244e9b9881f3adb76dcc8ed6e9a77691012e5786a26680a944d0876091bbb1d0f9ac63c0f5046538acf4402f840ac SHA512 b2486f32a3958c2b3e68d3f547dcd192dc7f8c59e0efd8660cd27cae9c218ce4fc2a60480dcb6bb0d10d8abbc2d2f4796075aea1cfab5e3c7cd12c38d4352fe2
 DIST libguestfs-1.48.3.tar.gz 19185249 BLAKE2B 1de07920c731a64ece9f1541752672a0251af73e455a3bd74fff6d512e96ef3a1b8182728080571fbf0f49ef072ed17029c6a5bd12f8171a1d2079bff0c22df2 SHA512 d88b7869e6098af1f7748dc2e8163b245ea251fcdf962a71e3735f5a1748c9e87a17be259802da3e0bb13569d7f7233b2c5a554b20a2a7758e1974a30a70b786
+DIST libguestfs-1.48.4.tar.gz 19189712 BLAKE2B 50a11254c21903caa62b40b43e3ab3cc9e740dd0c690055c245391d0a980279a897e727f0ff5b063b197b91a1e6fdadc08e257d5cd4ce3df254e5c42abc32ee3 SHA512 76b942de88fa6fb48db667054a2c4fc23dd17b0a6083cddd51f1a77fdac24c0c7acd6be5234ada955b4afa94b0d8023aab50aa152465a6bc65f0e21d4195d50c
 EBUILD libguestfs-1.48.0.ebuild 5283 BLAKE2B 6ee79999c8f08b9049465794eba05b8032b3882e824ab62233bb02d4392c5afcbc8de44f6064ec08ec350022b1663c558d78d30743868472149ca22ad832b844 SHA512 1b87f8e4842279feb6a01255fab33273138a4f9355cae0aa22ce9b601dc8854995b4eae6134a7a0d64d2d7b1ada02cc513da8d8d4f0adbb98c0633d0c3481c59
 EBUILD libguestfs-1.48.3.ebuild 5389 BLAKE2B 9005f8111fc6bf561feb5ac7bb0e4087a3b9e45b2cfb1b24760c0900a56dfc92c64687dea75d912dee3da06b37efdef77ad20726a8487b9ba2dc4316fca228aa SHA512 efd9cf5f32661a0057aa3f384ac47a90a4a1f719482606ca6dc9011b599b1b12e80209eb1b031b865e316896d330d660c201714e6fd1ce0af119be1505e22528
+EBUILD libguestfs-1.48.4.ebuild 5810 BLAKE2B f144df8a001829e7f4c202b34712f088d45f1ce39362fe9bc63606e9873d4ccce9a4f33560ee0c0aaf981a4a04eb73355ebfddfb6bcbacb852d677ea9e9c5857 SHA512 88487e6e6149b02522d429a0d282dc4720d2456cd63582cafd7e58c29727f5c4a2f1e7a49e07a1ad9033315cfca88a0bafd3f48fe9a53755b2a8b9efe5122412
 MISC metadata.xml 612 BLAKE2B 434f61bf6376288a782f4d2781938b6d647b7c1fab5d598a8fdd96c380ecef5947bd326a2c4f0d09fa40b6d00b1d59b86b27bea92cef311d9eae411d31465c3c SHA512 3dc1ae8480b6d1c1e2a800d8f8bb0f4171f645c69a47c9319b6d7ccefc2434c2d57fbcd0b47d48008196d1d1835693ccef984219bf7a2b10c444ffd04ef55672
diff --git a/app-emulation/libguestfs/libguestfs-1.48.4.ebuild b/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
new file mode 100644
index 000000000000..05b786614fa7
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.48.4.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there)
+
+LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
+
+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, inspecting, 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
+COMMON_DEPEND="
+	>=app-admin/augeas-1.8.0
+	app-arch/cpio
+	app-arch/lzma
+	app-arch/rpm
+	app-arch/unzip[natspec]
+	app-arch/xz-utils
+	app-forensics/yara
+	app-cdr/cdrtools
+	app-crypt/gnupg
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
+	>=app-misc/hivex-1.3.1
+	dev-lang/perl:=
+	dev-libs/libconfig:=
+	dev-libs/libpcre2
+	dev-libs/libxml2:2=
+	dev-libs/jansson:=
+	>=dev-libs/yajl-2.0.4
+	net-libs/libtirpc:=
+	sys-libs/ncurses:0=
+	>=sys-apps/fakechroot-2.8
+	sys-apps/fakeroot
+	sys-apps/file
+	sys-devel/gettext
+	sys-fs/squashfs-tools:*
+	sys-libs/libcap
+	sys-libs/readline:=
+	virtual/acl
+	virtual/libcrypt:=
+	erlang? ( dev-lang/erlang )
+	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:= )
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	introspection? (
+		>=dev-libs/glib-2.26:2
+		>=dev-libs/gobject-introspection-1.30.0:=
+	)
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	libvirt? ( app-emulation/libvirt )
+	lua? ( ${LUA_DEPS} )
+	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
+	selinux? (
+		sys-libs/libselinux:=
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+"
+# Some OCaml is always required
+# bug #729674
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/ocaml-4.03:=[ocamlopt]
+	dev-util/gperf
+	dev-ml/findlib[ocamlopt]
+	doc? ( app-text/po4a )
+	ocaml? (
+		dev-ml/ounit2[ocamlopt]
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+	)
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	test? ( introspection? ( dev-libs/gjs ) )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	acct-group/kvm
+"
+# 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}/
+	"${FILESDIR}"/1.44/
+)
+
+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
+
+	eautoreconf
+}
+
+src_configure() {
+	# bug #794877
+	tc-export AR
+
+	# Skip Bash test
+	# (See 13-test-suite.log in linked bug)
+	# bug #794874
+	export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1
+
+	# Need to investigate (fails w/ 1.48.4)
+	export SKIP_TEST_QEMU_DRIVE_SH=1
+	export SKIP_TEST_BIG_HEAP=1
+	export SKIP_TEST_NOEXEC_STACK_PL=1
+
+	# Need to be in KVM group
+	export SKIP_TEST_MOUNTABLE_INSPECT_SH=1
+
+	# Missing test data (Fedora image)
+	export SKIP_TEST_JOURNAL_PL=1
+
+	# 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
+
+	# Give a nudge to help find libxcrypt[-system]
+	# We have a := dep on virtual/libcrypt to ensure this doesn't become stale.
+	# bug #703118, bug #789354
+	if ! has_version 'sys-libs/libxcrypt[system]' ; then
+		append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+		append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt"
+	fi
+
+	# Avoid automagic SELinux dependency
+	export ac_cv_header_selinux_selinux_h=$(usex selinux)
+
+	# Test suite at least has a bunch of bashisms
+	SHELL="${BROOT}"/bin/bash CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		--disable-appliance \
+		--disable-daemon \
+		--disable-haskell \
+		--disable-golang \
+		--disable-rust \
+		--disable-php \
+		--without-java \
+		--with-extra="-gentoo" \
+		--with-readline \
+		$(usex doc '' PO4A=no) \
+		$(use_enable ocaml) \
+		$(use_enable erlang) \
+		$(use_enable fuse) \
+		$(use_enable introspection gobject) \
+		$(use_enable introspection) \
+		$(use_with libvirt) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable perl) \
+		$(use_enable ruby) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap probes)
+}
+
+src_test() {
+	local -x LIBGUESTFS_DEBUG=1
+	local -x LIBGUESTFS_TRACE=1
+	local -x LIBVIRT_DEBUG=1
+
+	# Try this?
+	#emake quickcheck
+
+	default
+}
+
+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() {
+	einfo "Please ensure you are in the 'kvm' group for decent performance!"
+
+	if ! use gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+
+	einfo "Note that common tools like virt-resize are now part of app-emulation/guestfs-tools"
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 702496aa3c70..45f441b42b62 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 33df81919930..2aceb3a0409f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -7,9 +7,9 @@ DIST libgit2-1.4.3.tar.gz 5631981 BLAKE2B 9308100ede912eae9d1fa4011c67f88f225aa1
 DIST libgit2-1.4.4.tar.gz 5855349 BLAKE2B 2668e351521e1cd9d2998c45c65e2a8c30f3436d94f86ebaa10382d01afb136bbde28c71d359fb57757ebbd44b1cef1bacd302023d0803a23697aee10f03ebac SHA512 8f4cc43de9b92866ac12e01613efe0ff808deca29ff82b6da98a38c814bb711ff3133145d0219210af7015955fbe381be6f1cb98915811d3c37e92b01eb522e9
 EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a0b4ffdc20274788d174de2735afa3d5a2cde3ec248e07e9c843a62547c240514edd9897f4dab1cd4a8c4455c8 SHA512 c3c00367cdd0f9d4699fc017f760eb193c324ed280149b8264d8f2680824308948437e771ab0ea901185e558a9fa535c13e906ffa0aca732fe2480874492554f
 EBUILD libgit2-1.3.1.ebuild 1702 BLAKE2B bf7205c0208ed8c8e1ec6085c24832189e193d5690aaacff611b39d19cb35a6c4dac81a9bfc7599d802727b6aeec271432f3c783bab51266aead3a407599afd1 SHA512 03104047c0650f07ec2d98dc0b77deb64646bb70c2a21fe1e1eb6fb5554f26577fad01717742f5e2185f7e76de47cb4058f2733a5baeda0a94859744dbb9470e
-EBUILD libgit2-1.3.2.ebuild 1702 BLAKE2B cb40fcd85effe8fd2556174157a9e57aa2ee06710affd339ad7d21c3e22cf6135e9e9fddba0c6e284517c42737d5e79122fa59611886e233a233dbb03b26af47 SHA512 e0ce0c851029d23d09a5c0d2f7e88e83feadb536d0480006b5eaf282db179825085f747d74c82bd11ac35576ae0892e8764d9d31380ef19f755e370f3a838216
+EBUILD libgit2-1.3.2.ebuild 1701 BLAKE2B 82f9fccd3a43e201c111ea6ca4b62bf2948a83c40f30ac50de0481bdc0fd82414f92ff9932bfa66b7c79d40c4763ffeca38a784608f82c2f385f0c3e66587736 SHA512 3adba047f8b0a4b63c7fb5568659a1aed57d244519be3956320a2bf6f2ee621a75ffb73dc569acf6c51af67d155256e60b3bb3bda82686e45e55b1f5fbe3cfbb
 EBUILD libgit2-1.4.2-r1.ebuild 1654 BLAKE2B e3f7bd625d0b8b0907419152e36efb41fa741ceb86b0a1054e5f46051e3738e7824d1c256b180b08d46035211b4b9bc17c1c8ff0af81aaaa47e3a5ed1bb5a0c9 SHA512 c37e36aee1b72ddf33bf190b4e7ee39d80b20e5e8d3297185aabe4af1db35a6de97e5eb7c3ac3c79437b493371e1001f798ecbae6fd7da10ee5131e8a482873d
 EBUILD libgit2-1.4.2.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
 EBUILD libgit2-1.4.3.ebuild 1699 BLAKE2B 23f3196cbf11b5dd91af8231344989e917f3f81502821c15a61bb4d0b19991bfafc9a217498112e0ff943b7244ae261bd2b5d045129173d1df6f8a0585f62f34 SHA512 28af72c276b82ed0a2bdd5f80f3fff5d107f50f379668d3261ee1d58ac128dc2ceef1e107c142c11544eeb00e3438b172b0df2cdae97b50fad03c7cd25990b05
-EBUILD libgit2-1.4.4.ebuild 1659 BLAKE2B 744a4b778da937053d1a89f53e6a0b915b31f002401b696a80529847406f3af087b5762d41a3429b49a6cce4ce8f1f78e40d3770390c6374648a04a74fed46d3 SHA512 ebd5e8eb3032bdbd56a237a8a56bbf8b826c6767db436d2cb302ab37001ff0e08f6b0a845504e4d31f63d0263ce119fa44a17db1ef6ed6f8032d95dfabe392eb
+EBUILD libgit2-1.4.4.ebuild 1658 BLAKE2B 38907665a09b927163f912b3e58a6113cdc913607bc8dbaf9f27d74f25e5a89b0c579a2bc63b51f9b8c33cf9f222e0e53a79b45c4035c7477e93811057ea0d1c SHA512 2883d2e13632231b06d6e78b8065f1cffc579fc9fec4a891928336114e91851e379b0d7684e4c1815ffb31d3f5d8b5042be1f549773fe7da55f448e009fbde3a
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.3.2.ebuild b/dev-libs/libgit2/libgit2-1.3.2.ebuild
index 0f7f4a322493..2b00acdfff78 100644
--- a/dev-libs/libgit2/libgit2-1.3.2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.3.2.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2/libgit2-1.4.4.ebuild b/dev-libs/libgit2/libgit2-1.4.4.ebuild
index c7905ef6482a..dc2287b2b344 100644
--- a/dev-libs/libgit2/libgit2-1.4.4.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.4.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1918c4503a91..778fc7d1c1f4 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/gapi-ocaml/Manifest b/dev-ml/gapi-ocaml/Manifest
new file mode 100644
index 000000000000..6cbc3774781d
--- /dev/null
+++ b/dev-ml/gapi-ocaml/Manifest
@@ -0,0 +1,4 @@
+AUX gapi-ocaml-0.4.2-ounit2.patch 1775 BLAKE2B 1e5bf19cf0adb559491c6ca9894d79bdff3fe6281d6a894b08f3fdc9576a2ba0b20ce5c7a72b620ca2592cbe76532227685fb8f7d6262dd095bab89d6fd68ff4 SHA512 98dc8a6481665ad3a4f89c7fc5879ef0161d165af7ee71651f2ee5eb2e5f789cde6b5461f870a478390c4198c322141164d6308c5b5c4c8f82fc37b39ef0b4f9
+DIST gapi-ocaml-0.4.2.tar.gz 466749 BLAKE2B 6a3e66618ed9a665de2892dc7657268f3bad43b871d6d761148152d61de2d988bc13b5051e39da4d1ddad0c620237c6018b87cd2303bc086c570aa879c197e4f SHA512 57d933c2d47ef7b80cb55b661f8df1b8642ff301d54f0fd1dfd4a9bc6238a4cb93a308e6918bbbc080fac146cf5fca2ccfe149d0528a63ead5e29e452c9cc427
+EBUILD gapi-ocaml-0.4.2-r1.ebuild 654 BLAKE2B 7a47627b86896d738c9e66152324ae67969be52b41f834de9fcd747af7584497baaf214ff86775567ffb840c89074323e51912e695834b0dc2280c0ca81225bc SHA512 04ba949fe16668d6a6d72737347aa1ff404dfadfba165209cf4d8ad0801cadc1b9bdf21cf187acc17f1e1f629cee5aa3fdf31594713b87d087fe74752130f1e9
+MISC metadata.xml 1046 BLAKE2B 4be6ad680be65ef85701c614caf80485cd68c7088358ce3b4ba201c3c4305630926cc0c4c3bb5c0d683a3ac2ba7c01463d9c5d0b281374bd8d32c1409a584ea9 SHA512 2ba3b944b84409512bca0bad76123719821f33666ebee5dbd1836baba1b7b67157b655bf6e13a9530e016cfa8c027398e98c3244405a6355f2c620e01e5583a3
diff --git a/dev-ml/gapi-ocaml/files/gapi-ocaml-0.4.2-ounit2.patch b/dev-ml/gapi-ocaml/files/gapi-ocaml-0.4.2-ounit2.patch
new file mode 100644
index 000000000000..36098d82ed67
--- /dev/null
+++ b/dev-ml/gapi-ocaml/files/gapi-ocaml-0.4.2-ounit2.patch
@@ -0,0 +1,58 @@
+diff --git a/gapi-ocaml.opam b/gapi-ocaml.opam
+index cb9b0fb5..923675d8 100644
+--- a/gapi-ocaml.opam
++++ b/gapi-ocaml.opam
+@@ -15,7 +15,7 @@ depends: [
+   "dune"
+   "ocamlnet" {>= "4.1.4"}
+   "ocurl"
+-  "ounit" {with-test}
++  "ounit2" {with-test}
+   "yojson"
+ ]
+ synopsis: "A simple OCaml client for Google Services"
+diff --git a/src/test/dune b/src/test/dune
+index 5d955f42..ef45f0ce 100644
+--- a/src/test/dune
++++ b/src/test/dune
+@@ -1,7 +1,7 @@
+ (executable
+  (name testSuite)
+  (flags (:standard -w -3-6-23-27-32-33-50))
+- (libraries threads oUnit gapi-ocaml))
++ (libraries threads ounit2 gapi-ocaml))
+ 
+ (alias
+  (name runtest)
+diff --git a/src/test/testSuite.ml b/src/test/testSuite.ml
+index 7851661e..150781f7 100644
+--- a/src/test/testSuite.ml
++++ b/src/test/testSuite.ml
+@@ -76,11 +76,11 @@ let build_suite_from_list test_list =
+ 
+ let _ =
+   let test_list = ref (core_tests @ model_tests) in
+-  let ounit_specs =
++  let ounit2_specs =
+     [
+-      ("-verbose", Arg.Unit (fun _ -> ()), "See oUnit doc");
+-      ("-only-test", Arg.String (fun _ -> ()), "See oUnit doc");
+-      ("-list-test", Arg.String (fun _ -> ()), "See oUnit doc");
++      ("-verbose", Arg.Unit (fun _ -> ()), "See ounit2 doc");
++      ("-only-test", Arg.String (fun _ -> ()), "See ounit2 doc");
++      ("-list-test", Arg.String (fun _ -> ()), "See ounit2 doc");
+     ]
+   in
+   let arg_specs =
+@@ -100,9 +100,9 @@ let _ =
+       ]
+   in
+   let _ =
+-    Arg.parse (arg_specs @ ounit_specs)
++    Arg.parse (arg_specs @ ounit2_specs)
+       (fun _ -> ())
+-      ("Usage: " ^ Sys.argv.(0) ^ " [-service svc] [-all] [oUnit arguments]")
++      ("Usage: " ^ Sys.argv.(0) ^ " [-service svc] [-all] [ounit2 arguments]")
+   in
+   let _ =
+     (* Reset argument counter, to let OUnit reparse arguments *)
diff --git a/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..156be6ded14c
--- /dev/null
+++ b/dev-ml/gapi-ocaml/gapi-ocaml-0.4.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune findlib
+
+DESCRIPTION="A simple OCaml client for Google Services"
+HOMEPAGE="
+	https://opam.ocaml.org/packages/gapi-ocaml/
+	https://github.com/astrada/gapi-ocaml
+"
+
+SRC_URI="https://github.com/astrada/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+	dev-ml/ocurl:=
+	>=dev-ml/ocamlnet-4.1.4:=
+	dev-ml/cryptokit:=
+	<dev-ml/yojson-2:=
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit2 )
+"
+
+RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-ounit2.patch" )
diff --git a/dev-ml/gapi-ocaml/metadata.xml b/dev-ml/gapi-ocaml/metadata.xml
new file mode 100644
index 000000000000..550aa3b52af7
--- /dev/null
+++ b/dev-ml/gapi-ocaml/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription lang="en">gapi-ocaml is a simple, unofficial, OCaml client for Google Services.
+The library supports ClientLogin, OAuth 1.0a, and OAuth 2.0
+authentication. Supported RESTful APIs: Calendar APIs v3, Google+ API
+v1, Tasks API v1, APIs Discovery Service v1, URL Shortener API v1,
+OAuth2 API v2, Custom Search API v1, Google Analytics API v3, Page
+Speed Online API v1, Blogger API v2, Site Verification API v1, AdSense
+Management API v1.4, BigQuery API v2, Drive API v2, Drive API v3,
+Gmail API v1.</longdescription>
+  <upstream>
+    <bugs-to>https://github.com/astrada/gapi-ocaml/issues</bugs-to>
+    <remote-id type="github">astrada/gapi-ocaml</remote-id>
+    <maintainer>
+      <name>Alessandro Strada</name>
+      <email>alessandro.strada@gmail.com</email>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamlfuse/Manifest b/dev-ml/ocamlfuse/Manifest
new file mode 100644
index 000000000000..37878c76756f
--- /dev/null
+++ b/dev-ml/ocamlfuse/Manifest
@@ -0,0 +1,3 @@
+DIST ocamlfuse-2.7.1_p7-r1.tar.gz 21469 BLAKE2B fa587d19124c2e2d320091bb42b098644d3112e39652dbf621c88f701effdab0ce15372b6f2461709eb3afe628e2888db3a7a0c9abeab8b8a136d09c69c84ac4 SHA512 342a6ce8a81ac05d47d4458ef6e9aa750e4e7643a89d28705664852f0549e1932643e8db5d93225ba496611654b3f11fef6aca1e6e40e8d4b30064fc9c65f7fd
+EBUILD ocamlfuse-2.7.1_p7-r1.ebuild 688 BLAKE2B 6c72ae2f700e635bf79b09d54922d6513eb673010b4598f49770c3edf887cc4d77123d506da59fd0154c8db3856ecabb07751aeb1d607076a565412b331eec74 SHA512 f9bc57c1a0b95ad15f6244026a9cbe7499e2249489187a4e5190a3863a3e61c8429ab9cc68f8277b4e10147fa935b33291f41ea0a848e195a6de6f1716c60ddb
+MISC metadata.xml 989 BLAKE2B 04cc7e720c9eaabf3e13d8a3671bf40162310524fd12c13ed23e17a50ad766c72fde4516b9be975ec8c2a1572e674971b8c71421070cd71b9063de45fbfb8b4e SHA512 aa026a7c35bfcffa35642470a704762e0e7a88bb834c93d7628d90bd1ad937479f6545ed3d75260060887bb22d0fc1f5134785948dbdfef357aebdf11a9caf55
diff --git a/dev-ml/ocamlfuse/metadata.xml b/dev-ml/ocamlfuse/metadata.xml
new file mode 100644
index 000000000000..c4853a8f842c
--- /dev/null
+++ b/dev-ml/ocamlfuse/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <longdescription lang="en">This is a binding to FUSE for the OCaml programming language, enabling
+you to write multithreaded filesystems in the OCaml language. It has
+been designed with simplicity as a goal, as you can see by looking at
+example/fusexmp.ml. Efficiency has also been a separate goal. The
+Bigarray library is used for read and writes, allowing the library to
+do zero-copy in OCaml land.</longdescription>
+  <upstream>
+    <bugs-to>https://github.com/astrada/ocamlfuse/issues</bugs-to>
+    <remote-id type="github">astrada/ocamlfuse</remote-id>
+    <remote-id type="sourceforge">ocamlfuse</remote-id>
+    <maintainer>
+      <name>Alessandro Strada</name>
+      <email>alessandro.strada@gmail.com</email>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild
new file mode 100644
index 000000000000..fdf08ccbc300
--- /dev/null
+++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune toolchain-funcs
+
+MYPV="${PV/_p/_cvs}"
+
+DESCRIPTION="OCaml binding for fuse"
+HOMEPAGE="
+	https://sourceforge.net/projects/ocamlfuse/
+	https://github.com/astrada/ocamlfuse
+	https://opam.ocaml.org/packages/ocamlfuse
+"
+SRC_URI="https://github.com/astrada/${PN}/archive/v${MYPV}.tar.gz -> ${PF}.tar.gz"
+S="${WORKDIR}/${PN}-${MYPV}"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt"
+
+RDEPEND="
+	dev-ml/camlidl:=
+	sys-fs/fuse:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/dune-configurator
+	dev-ml/opam
+"
+
+src_compile() {
+	tc-export CPP
+	dune_src_compile
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5086877804df..03e738186f76 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 115f6bbdbcf6..c870cea99a7e 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD actioncable-5.2.8.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
 EBUILD actioncable-6.0.5.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
 EBUILD actioncable-6.1.5.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
+EBUILD actioncable-6.1.6.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
 EBUILD actioncable-6.1.6.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
 EBUILD actioncable-7.0.2.4.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
 EBUILD actioncable-7.0.3.1.ebuild 956 BLAKE2B cf4741405761f6b1a459da877cfae0d87b649bcce4b39472400aaef685e37b9c5c228b786d22e9c6d49df70ad340910c32b53a4c972337ff08a7c7800cc739ff SHA512 aff75042078487a1ac9ad7598c9dba3565dfd6f592ca9a258d3886be7bad801a4c43a589c262ad8c625d6d0a4937121991e643ca8d07b4969f30ee12a04d1e75
diff --git a/dev-ruby/actioncable/actioncable-6.1.6.1.ebuild b/dev-ruby/actioncable/actioncable-6.1.6.1.ebuild
new file mode 100644
index 000000000000..b5ec3e98161d
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.1.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Integrated WebSockets for Rails"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# Tests require many new dependencies, skipping for now
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/nio4r:2
+	>=dev-ruby/websocket-driver-0.6.1:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/railties-4.2.0
+		dev-ruby/test-unit:2
+		>=dev-ruby/mocha-0.14.0:0.14
+	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 9cf98fb9125c..f1983ba97a25 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,11 +1,13 @@
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actionmailbox-6.0.5.ebuild 1847 BLAKE2B 09ffcadcc426136ed322e1d07c318f94aa05e9c005e104f143aee4763ead0c302883515c17d14609f061806f90680e8054211a6524206cea69ebd04a27b95a69 SHA512 80420ef29eec43301417da81b0ba0637ae36132cbb096c5e46192c1fcb87b9c3fcbec69f343499f6587fd2af582d9f5b4396e05bb5d2025010bb6fb722c556e7
 EBUILD actionmailbox-6.1.5.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
+EBUILD actionmailbox-6.1.6.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
 EBUILD actionmailbox-6.1.6.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
 EBUILD actionmailbox-7.0.2.4.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
 EBUILD actionmailbox-7.0.3.1.ebuild 1997 BLAKE2B 7895a26140ce7eed1d1ac28c2ffefb89f952a672a050f4f3332b0ee24be682e422444813970ed824cc6c8b5c223c5f2c6810f279ac87cb5248927b9a228ccc92 SHA512 cb9e57dac284f1b94c2b8a428a3323f86bdbb9739e1a716e2fde4ece0229a0ba6cdc025a780089f11a543d6d405ac5617c016d7e804409efd7a79846b2750d51
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.6.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.6.1.ebuild
new file mode 100644
index 000000000000..5fabeb5d6ccd
--- /dev/null
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/mail-2.7.1:*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha
+	dev-ruby/rexml
+	dev-ruby/sqlite3
+	dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 09d4f34fd040..d2dbd98d8700 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD actionmailer-5.2.8.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
 EBUILD actionmailer-6.0.5.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
 EBUILD actionmailer-6.1.5.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
+EBUILD actionmailer-6.1.6.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
 EBUILD actionmailer-6.1.6.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
 EBUILD actionmailer-7.0.2.4.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
 EBUILD actionmailer-7.0.3.1.ebuild 1256 BLAKE2B 689995cd34ae5410436b710153a4a34fd5f994b763fad99147e2d6a1e0a04c1e7a5140c179d1f9f3e0b979b34f5e49015b91d7d589b3ba55dd865d3e3e5a5000 SHA512 23d65d7c6d163ee01dbb162da76920b5b53b2010ca69c13021afe5217f382ab5e9722df8007be1d6310181058f92216ece94f58227ae886d9f71ce4d84c84c88
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.6.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.6.1.ebuild
new file mode 100644
index 000000000000..95aa6013c4aa
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.1.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Framework for designing email-service layers"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
+	dev-ruby/rails-dom-testing:2"
+
+ruby_add_bdepend "test? (
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Avoid a test failing only on attachment ordering, since this is a
+	# security release.
+	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
+}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 171aeb3ea1bc..3408b956a36b 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD actionpack-5.2.8.ebuild 2244 BLAKE2B ed76ab1f2dc5c3e4369dd971ef5ca2140a7428a57001abc5cfc3fafdfb72d7ea019e15f0442f2d5cc9cf14e1d9142406acc70401ac27ff445a298a76d4ba8367 SHA512 cbb53ce4f5b334dbba0f1b37897e91807494666f4fa89abb93416410831d21f2e361e39e14abcc2fe732672cc36baf2c70e7440b389cc3d263ccff63ae4ae58d
 EBUILD actionpack-6.0.5.ebuild 2050 BLAKE2B 65d7d33132b1618caadba241c62959e9c8e24e7c87f6bb8af080ab13fc179fc34ad321f076a119ad562661b35f76e5c3fb8c7aa28ec86ef3809d69ece3d42f93 SHA512 66c1a8585e950cf7df7d68a36b3f6703a72864fea2d526c541f4aaa9e083126a0caf18fb801f96e1810977b48f3fd58fe23e68e018be7b393d8cefb9886c0ba1
 EBUILD actionpack-6.1.5.1.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
+EBUILD actionpack-6.1.6.1.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
 EBUILD actionpack-6.1.6.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
 EBUILD actionpack-7.0.2.4.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
 EBUILD actionpack-7.0.3.1.ebuild 2045 BLAKE2B 0a7f633c04fbecbc23ea2183ca8f8a4a939a52cd9f55a4c761e170c5db85730cb15b06119d9d9489a14b7c16999f35b27fccfb6004c8d55933cb4de5f4d4ba25 SHA512 1c80a7aa6a890e2ed138f3b1f9371318f8ff4b5dd0ab07e7e482b90c1a4c0974b4b7cd0891ea3815814599ee59f5f1dd3e90616d349fe2fc54e00883c6f31e6f
diff --git a/dev-ruby/actionpack/actionpack-6.1.6.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.6.1.ebuild
new file mode 100644
index 000000000000..8a43d94f6c01
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-6.1.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.2
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		www-servers/puma
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
+}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index d1629f6e1b77..cba5b335a47c 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,11 +1,13 @@
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actiontext-6.0.5.ebuild 1762 BLAKE2B d4b5aefefb68ca292b5e0e7228c39096107ce342cb8e550cf2b8a15af96ad6b7afe73baab1152c02b8625fd2f493621f8f626eb048f3311ae2b199114814d526 SHA512 4e0176dfcb172c0f1d97e7f4116dadfbe6580830678122e02617b2d88a3c0bd080c0ff1850bc472d6c9c534bbb6303e79f361e3730222495c662174d6395e3a5
 EBUILD actiontext-6.1.5.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
+EBUILD actiontext-6.1.6.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
 EBUILD actiontext-6.1.6.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
 EBUILD actiontext-7.0.2.4.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
 EBUILD actiontext-7.0.3.1.ebuild 1875 BLAKE2B 1cbb4b8451a4334e35674c95c6f2f7b0775cf29219bbdb25adb7d3d6ea2c84150bf4db7758585e959454d67339b23b1ef19bf302dff3499f4b9f17ba4fe0082f SHA512 390d8999ad159ed5f7f2c39ac426daca0dd8c5b46f8cf101f15cd2cce4a573f79aac886a69405bba331461d7be51f9116d2850a74bd0457e064d54e78e3ae1c5
diff --git a/dev-ruby/actiontext/actiontext-6.1.6.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.6.1.ebuild
new file mode 100644
index 000000000000..e0c1fe100689
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.1.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Edit and display rich text in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/nokogiri-1.8.5
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
+	rm ../Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 857a9396563f..674e298abdfb 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD actionview-5.2.8.ebuild 1948 BLAKE2B 305564c561cd73ac2f7f6a564c72bff3bc8d8415856899848ef3e4ba8c3ac14f4cd98995e33142140f733ae83476437a22edc7c5a32c63c2b09b0ba8e3770646 SHA512 37697c0dfd0f9eb823f8dddea5c4b94201156b72f1243d278753e9a7800dcff273e3454a3c71d3ee171cc1d2aaaafe4aa2e6f82cfab73504b75404f4b2c38c87
 EBUILD actionview-6.0.5.ebuild 2264 BLAKE2B 526d8dd95fc8d6db6d2093f0696347da2e903fc787de6250d8203177b310969279637d40b3279115ce12c045f81fe167ac67957d110a97d5b2426afe579bc3b0 SHA512 a36885040b2fd55d6daf7f8fc4fadd5bdd3981950fdac6c0780c73bbf42fe005fc1cba42fd61d37133532ca036d6084a922b2b11b4f9c081d5f1499a67b8a18c
 EBUILD actionview-6.1.5.1.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
+EBUILD actionview-6.1.6.1.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
 EBUILD actionview-6.1.6.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
 EBUILD actionview-7.0.2.4.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
 EBUILD actionview-7.0.3.1.ebuild 2174 BLAKE2B ece7792056200db06a689fddd66e0d8d22b608256cd62e15b4742a5af6f9b2171caf5c7202533542def4202db0136bacfa2322d4b5970323fe456e6e1d4646a8 SHA512 ac3570332debe2b19a019ab84df7b1c1b94249dc474e65d199b9a8177b6d09d7bf66437cfd770b86fac0cc330e3931dfffeca9259d5063661a6fc8026cba8ac3
diff --git a/dev-ruby/actionview/actionview-6.1.6.1.ebuild b/dev-ruby/actionview/actionview-6.1.6.1.ebuild
new file mode 100644
index 000000000000..7beb67cb12f0
--- /dev/null
+++ b/dev-ruby/actionview/actionview-6.1.6.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index d44fd9369d07..b5551522343f 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD activejob-5.2.8.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
 EBUILD activejob-6.0.5.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
 EBUILD activejob-6.1.5.1.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
+EBUILD activejob-6.1.6.1.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
 EBUILD activejob-6.1.6.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
 EBUILD activejob-7.0.2.4.ebuild 1189 BLAKE2B 19c984bf8d98c3abb4f985ded7eefe0f47752eaca407536e238ffa059ec2ada62d7a209a3d2e0d778cb285157bb423d5887159f6364f011c1a38be83765a6e03 SHA512 2186ed2f6431c0b7a81805f8863fb1f84fad5f919925ace28c293c420d270c4c3538cf965f3157b0012e5fef69feb40e0632ba846314a8af593285db9761e1d3
 EBUILD activejob-7.0.3.1.ebuild 1196 BLAKE2B ce2c838fd7f393af92ff846020a519251bd9e7fb2028912ecad53b75c0322c339d14bf442eee37b2484d022f28880a342320f06daed4b74d31c6cbca588e3579 SHA512 4cd71e86f386e5fec052991d446b02b1484735880a1c73a3d2d61310e178d76e798e2336e67579e15a3f7f56e8f4b698a8e5067080e6b49811a79f184f18f35c
diff --git a/dev-ruby/activejob/activejob-6.1.6.1.ebuild b/dev-ruby/activejob/activejob-6.1.6.1.ebuild
new file mode 100644
index 000000000000..ca98657bca3d
--- /dev/null
+++ b/dev-ruby/activejob/activejob-6.1.6.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index a6dab830ccf1..de605f3622e7 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD activemodel-5.2.8.ebuild 1119 BLAKE2B 750cfa6bbfa3d980ecd85af9a5ba1cb1c584ccb4cb75868edeb0e2d3cb990665dd214e915b5a8f28f6622a18ae738e656945ea361e6f1266c99e99b10a9f89bc SHA512 553218e1b4ab9c8f21e9b2e0318408080dedd500843f348cd8f8d8d776e7a54707a1f2588c0b8ec57daf196c2616eed118c2826629dcaca33719addf1fcb5db6
 EBUILD activemodel-6.0.5.ebuild 979 BLAKE2B d133462df1ba9abeba44ac98697dd6fd8664786c4570ba0464db23f65dc2174d61229ab5f6e8a7a02d10fcb67276dabe0f32bc469e3b6c9262ba6fff772eaea3 SHA512 baeb6b75578718cef98f32eb37a89ad99bd8c0c061384086927da7bc1f53a41365e79b5772d94f7100ade15717744220d0262dd0191ad88684a0b03f02a50a50
 EBUILD activemodel-6.1.5.1.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
+EBUILD activemodel-6.1.6.1.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
 EBUILD activemodel-6.1.6.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
 EBUILD activemodel-7.0.2.4.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 EBUILD activemodel-7.0.3.1.ebuild 986 BLAKE2B bea10023caad02d1591eddd28a1fe3dd7ed94a8ecee599f965aefee7f5291b5abb38dd910983aef5e8e35cf8857fddf9a6b65541aaf86be398ac04601d25f861 SHA512 dba361ab4a6a9c7fbf0fd8cad9d4979496f3ac135a4b5bc3e9b363129b51f608123df4c560f807949bb87f6024a4493f213def5b46cab5eaee160ce676990251
diff --git a/dev-ruby/activemodel/activemodel-6.1.6.1.ebuild b/dev-ruby/activemodel/activemodel-6.1.6.1.ebuild
new file mode 100644
index 000000000000..72f40d438434
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.1.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index ac328ab0a7d2..5c556bc69ca0 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD activerecord-5.2.8.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-6.0.5.ebuild 3305 BLAKE2B 56750c79ebf17eb77a5bcb0bae407158916d3f3f2491b257a158acda5d35dea32f6f71f51e6b0485c79a27c464563b89de965f729cb20de8abec2d7a38873e5e SHA512 96d6e7118ce82d0cf573d920b754ba91ed6b5127d8ef4c5df2d818bd837dbe768940faf2705139e8562d30185edfa83f250dd0cd7f9e6824901d4cbc64acd307
 EBUILD activerecord-6.1.5.1.ebuild 3376 BLAKE2B 16091f6b4a2ee090cc13c59ba4c5d198f7815ea0f6b45f7d719f28e561ca81829900d8f5e158045ac1027475a90001fb0551848613d0110ebd09c575a62bdd2c SHA512 7afc3d49f9025fd6a87e67a9df55aefc16a4a55bd2bb05eecc71a92a6dacf6933fb2522a91e78d7941ba6fd57767e7e8d263169166d91c94afc311ec32c340c8
+EBUILD activerecord-6.1.6.1.ebuild 3403 BLAKE2B 213b79922959579a6b6fce326ee72cc8cc9bec2bd48f58bbd1e56a4b260292fda4c27ef9be79cf9be1292aed67546d5ddd45b9e89d1b849069005c59bc71d4bc SHA512 2fd555f4736c414514fcbbf471b9a59c27d473e6589ae4741745cc8cef19ba7c8d60d63c3feebfc209922947b0c325e4370e931869e9e6073dc2475434be8dde
 EBUILD activerecord-6.1.6.ebuild 3403 BLAKE2B 213b79922959579a6b6fce326ee72cc8cc9bec2bd48f58bbd1e56a4b260292fda4c27ef9be79cf9be1292aed67546d5ddd45b9e89d1b849069005c59bc71d4bc SHA512 2fd555f4736c414514fcbbf471b9a59c27d473e6589ae4741745cc8cef19ba7c8d60d63c3feebfc209922947b0c325e4370e931869e9e6073dc2475434be8dde
 EBUILD activerecord-7.0.2.4.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 EBUILD activerecord-7.0.3.1.ebuild 2990 BLAKE2B 6940896aaf30a9442cd1a50b97ee828515784499b102762b29ebd19ee47dc9cf47ab2139f454ab4e28c7a78804976a9d8e9c9ba15fb99ac8ef6f9a0e3e5a9c1d SHA512 86042bd64195bdf13ee02cd503f86ccd82bb071465cff7c30c66b2532f440c6c0c52027566c3701dd895f9bbe5fbef3becba5968423a02cb6c5cb605150d05cd
diff --git a/dev-ruby/activerecord/activerecord-6.1.6.1.ebuild b/dev-ruby/activerecord/activerecord-6.1.6.1.ebuild
new file mode 100644
index 000000000000..ff94a28571da
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-6.1.6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+HOMEPAGE="https://github.com/rails/rails/"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		dev-ruby/minitest:5
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	# Load correct rails version
+	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' test/cases/helper.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid tests that no longer work with newer sqlite versions
+	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
+	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 1554faac814b..298d63b3975b 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD activestorage-5.2.8.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
 EBUILD activestorage-6.0.5.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
 EBUILD activestorage-6.1.5.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
+EBUILD activestorage-6.1.6.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
 EBUILD activestorage-6.1.6.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
 EBUILD activestorage-7.0.2.4.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
 EBUILD activestorage-7.0.3.1.ebuild 2480 BLAKE2B 439b264b9d073070d1bc63873adfdd8561b018b71ca261918cbb52939c5c3a00cb2aed181f05234d45df05c9fc0fd3e355cb84e0267d74ff577faece5b4cb17e SHA512 3ecd06f35d8d9a12ea7193ac898f1542f18c15d844a757d2a5a1a6744f96c758f93ee731fd24017adbd38624bba5fc09b32c603e702b0f773a3f9c4021211a0c
diff --git a/dev-ruby/activestorage/activestorage-6.1.6.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.6.1.ebuild
new file mode 100644
index 000000000000..102dbabfb7ed
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.1.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+	>=dev-ruby/mini_mime-1.1.0
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		dev-ruby/test-unit:2
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+	   # Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+			-e '/dalli/ s/2.7.7/2.7.9/' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
+		rm ../Gemfile.lock || die
+}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index bb778295aba9..02bedbef84ac 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD activesupport-5.2.8.ebuild 2565 BLAKE2B a756faffde922c8d3d9a291351d069364444b0a4382a90b9d326363c7c6444c50074417dfb8c46869daf8192aa6caf7caecb3616b40d8a3a56651070843cf7a4 SHA512 d8c773ddf3186a43d028e363520ed8b5686c2a6d691153982d0c322e42a3c8c1a26b0561d2033cac4002e7c2164033a429330413c1a7eb704dc982127f6f4f8c
 EBUILD activesupport-6.0.5.ebuild 2593 BLAKE2B bef9468f2915a8f675ff63a1f202a26253862d06f06aa1bd819316973af8aec4bb25a84ab68b7e77fa6ef5524d8784873ec0750949cdddd82c5f896df3e69308 SHA512 30b66c4243686fa1c2430d557c38450477e7a827896ab4a3f72074d1c1a4542dcaad1c4d55b242121c5803e6d96358dd816255c65bc4f37d677667166336c937
 EBUILD activesupport-6.1.5.1.ebuild 2686 BLAKE2B 64ca20f79b35e3122338d86e561cfe94ca26043aacee60846cd322942126771c914eb55b3acff504d25e197b62e08e2dba587fe63add53729a2967f5a6810ccd SHA512 1671dadf7797a7edc97f55cca0067ff544d4293ca39a6aa2cbfc9fabc25c8e51cffc7c854f5906054aadea45c4843dc76a2b693e04602aaf92def5b377e101f6
+EBUILD activesupport-6.1.6.1.ebuild 2693 BLAKE2B 5c16c4652539a3d43e32f14bc5bbc928dacec443125790ad1fb0e5a46b5289075be3e5fa59a53be1852d3cd36353c047b9ab4aa4e4287cfc20a1edbfc16edd84 SHA512 3f788fe31e0b016e86666a7560d167177ab0f2d69ad7a0607fa64a6a5fc62ff5636a036413c5ccb4b772d481089cf86c67fa0ccf26037bdc1b8b9821fdba99cb
 EBUILD activesupport-6.1.6.ebuild 2693 BLAKE2B 5c16c4652539a3d43e32f14bc5bbc928dacec443125790ad1fb0e5a46b5289075be3e5fa59a53be1852d3cd36353c047b9ab4aa4e4287cfc20a1edbfc16edd84 SHA512 3f788fe31e0b016e86666a7560d167177ab0f2d69ad7a0607fa64a6a5fc62ff5636a036413c5ccb4b772d481089cf86c67fa0ccf26037bdc1b8b9821fdba99cb
 EBUILD activesupport-7.0.2.4.ebuild 2654 BLAKE2B 18b341807ecfc5657b2f75d6649f5e4fa21aa02d976146c4b873796482f1cafea278f0dfd0ffdcf27985c08e2394736d3ddd625b74410cd14b7eb7fae1db0ae3 SHA512 977b8788acd684828c64cc854d633eb55247037bd41e876b94b99385e11535ef34e710dc40cb240656a5c52bd724e11d3b2bf546580dc09c7bf307d67d554562
 EBUILD activesupport-7.0.3.1.ebuild 2688 BLAKE2B 455289571360bc0a2201bd0a5f75462e7c8b0f800c5af887bbb9b9845b3add97551b366c308623861f938be6b54abd521cd9ec0eb181254e6256c2fd01a58b62 SHA512 373d79a9a00bf6c871ea241643d4a3468d96e75d28881cf50fa5dbe66d6168eb5a09e82882048b755560837ecd9596c2bdc7b3d0ddd357b3b80e758635f4210d
diff --git a/dev-ruby/activesupport/activesupport-6.1.6.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.6.1.ebuild
new file mode 100644
index 000000000000..cfe7a844bc9b
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-6.1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.0.2:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
+	>=dev-ruby/minitest-5.1:5
+	>=dev-ruby/zeitwerk-2.3:2
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-2.2.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 23a6e17d2f3f..530cdfacfe4f 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.gem 6656 BLAKE2B dc30dc10e9a2d9f72a9827931ebb1cc34eea3495fbbf0ffdc4feb46ede25ada6f26e8e3ada1180f639eaf066fac0b80cccf5e601c9f73ec507211e9b73ece58d SHA512 b8ac1afc31a13ec9736ef81dbdd3ad89c4c7337e766e3598ea0c467fb06b925dd29372bef7b6b8f7b26ca9a51c1e831621338753519075b3d03f4bf7c237fe82
 DIST rails-6.0.5.gem 6656 BLAKE2B 3cb1a7c175ddd0e69335df2ec4abd9e4edea89e6c69627245b27f676a152e712eb475b6479477cc1cb31f0be7eba1ae11529d3820b9c183139f10064daab38aa SHA512 7ab1e1ae524b9e68f95f833f47908888a1699f5af6494102e66e7c7476924d4dc793228eaef78dda9a497e1988f8367c357a25e7df587b4c9fc9ddcdfa0eb7ce
 DIST rails-6.1.5.1.gem 6656 BLAKE2B 1f050c2c98bafdfe4c70c8581488336efb81e7a93bd86a2a996a6342aa6643e7360eb00d6455939d9412dd5bda3b3cd6770d14b66cb2f00812be4eb950a968aa SHA512 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
+DIST rails-6.1.6.1.gem 6656 BLAKE2B 10d7bfe4c92b4485de328d9b9806bdb79bd74f9bb23ef09cf9609362927b1474ca3ba35e54da6c8fd9745b0364f4f6a9390b4c1ad641a5ac437c222cadfa25bf SHA512 90ef98bbedd76feb4c1835062069cc5afd5bf5c191cd0858efe03dc5fa80194773ec7b21a3296a24089178faa14f1cd68f8e9d934f362b03ebeef81998a7f18c
 DIST rails-6.1.6.gem 6656 BLAKE2B 94cbed0213ed04cd0e94d1d9b0af0204ab50c5120efafa950eec899cef814942772ec6f98e4ebcc51657a104d9fe29b060e55f6d1a2dc9a9c7701d3b171ac638 SHA512 60639b4247029d90ef12dffad37a007672d0cc3672316da540ed38e7d6c8a2702ed51e5a48797e1db5beffa042007cc9a134924d8f1f242f49f0c470c80f750f
 DIST rails-7.0.2.4.gem 6656 BLAKE2B fb38071f7968361cf08e3332b536e3abdd0ad9730374c19b8322d3c9d688b777c5ccf92d1312336f9cfdcf7765894c44247b5073466dfd073319aef951162ae6 SHA512 18c77aa5ee62b31b0e44a65cbdf99b64b40634ecde72b22601912ce24d7ad0bcf364ef5f8e69fb974802b4e5c1027dfd61664ba5eb8e196f53d4b244eaba5210
 DIST rails-7.0.3.1.gem 6656 BLAKE2B 2935e847874de0ce1d691efed7097e3b203c9991e7778dcd28813628dd43b59e54862d4224367afd79db97aac4e7e76825936b78380616232fd93396d1a54039 SHA512 b15d6eb076c688676a747932122d73e47ca272c97fe4c41816de84e8f5699df48a7fa6b767acaddd422591572b87e8fe0180bae1578ace7d9f136ef739d4e891
@@ -8,6 +9,7 @@ DIST rails-7.0.3.gem 6656 BLAKE2B 4f67a44190a44a6ba22447f7ef900b067332024a74bab2
 EBUILD rails-5.2.8.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
 EBUILD rails-6.0.5.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
 EBUILD rails-6.1.5.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
+EBUILD rails-6.1.6.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
 EBUILD rails-6.1.6.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
 EBUILD rails-7.0.2.4.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
 EBUILD rails-7.0.3.1.ebuild 863 BLAKE2B 9d0aaf977dd91bf6e05a3fa068f6c7282db987f0934b652c2eac3dfb3f048a6e606998d571d2ef18d0bf72c5c2a9c606b13b1f50196f25e9a3d7d9e9bd2b2da8 SHA512 8aebdb01b464fbc672d27ba5de7459625a1c1fae9fc49b9db878ee6d30732de2ce77b582e3031c070178ace7793863fcdbc073063c7d16f393b76c85ddfab338
diff --git a/dev-ruby/rails/rails-6.1.6.1.ebuild b/dev-ruby/rails/rails-6.1.6.1.ebuild
new file mode 100644
index 000000000000..5330bc6f88eb
--- /dev/null
+++ b/dev-ruby/rails/rails-6.1.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby on rails is a web-application and persistance framework"
+HOMEPAGE="https://rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	~dev-ruby/actioncable-${PV}
+	~dev-ruby/actionmailbox-${PV}
+	~dev-ruby/actionmailer-${PV}
+	~dev-ruby/actionpack-${PV}
+	~dev-ruby/actiontext-${PV}
+	~dev-ruby/actionview-${PV}
+	~dev-ruby/activejob-${PV}
+	~dev-ruby/activemodel-${PV}
+	~dev-ruby/activerecord-${PV}
+	~dev-ruby/activestorage-${PV}
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/railties-${PV}
+	>=dev-ruby/bundler-1.15.0:*
+	>=dev-ruby/sprockets-rails-2.0.0:*
+"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index b3395f80cf65..98ff132e18e4 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,6 +1,7 @@
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
+DIST rails-6.1.6.1.tgz 11028264 BLAKE2B 568033eb816613ba0ba5f2df38e6a30158b2e31ef4d4da151f8c0de2934b07736833026793ce9192994d9ef2a2a45b67735a35760c1be8b8a68c1968147cc6db SHA512 04acf9dbf5ee734636aada67be001690899eb13f73ea688455fcaee8cbf4839aedf06943c8adb5eecf13fd9a5f6be1a225310aa481d3a254172fd0ce0402362f
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.1.tgz 11049683 BLAKE2B 31aa9c20b4add7e11b832aff57fcf78284b7f28e71cfc71b5769c65170f1fff3f33d73224bbfa826852a59aac30671ff7c3ef19cbe0aaabc8528a805c6b98e8a SHA512 2ad615df9e019193489d5ce82152fd0ff12d8435401258b2b8a87d1c5da46587cdd45dc483847891f7b8be1d019b09b77a48fa7849d5260ee6fdbbf6df64ef03
@@ -8,6 +9,7 @@ DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d03320608
 EBUILD railties-5.2.8.ebuild 1631 BLAKE2B c55333e565b6591df6c6b3ae22d1476726e0a459d5694b0ae0a08e201b065ce4414d1accac499d3d018be94f603a78030062fea53bc0861cb87136795990d4d8 SHA512 cc8ebb684d9d8c2ab20c282f9f370e0a1678f13ea47d5d434335addcd79f51ed849f5d96b3cae345ec507d6e8ef7616befeff4c46237c5ec2c0c9ef5f1e8bbae
 EBUILD railties-6.0.5.ebuild 1617 BLAKE2B 7a637ba3e66934a9edd4db0012c280c2c8b032b94c67a6a40923dac7f4d4bc7544395e696da558131b4cba914641b3d47b8ac970c86f229255a67c9cae0893e1 SHA512 9e45f2a7563e9bd9401c800d46de0d87579edc1c9e185fd102dd5f4881b1878c3f704eeeef1189563ca90312a034bb8fd37393d8a5356fec733d547694038934
 EBUILD railties-6.1.5.1.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
+EBUILD railties-6.1.6.1.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
 EBUILD railties-6.1.6.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
 EBUILD railties-7.0.2.4.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
 EBUILD railties-7.0.3.1.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
diff --git a/dev-ruby/railties/railties-6.1.6.1.ebuild b/dev-ruby/railties/railties-6.1.6.1.ebuild
new file mode 100644
index 000000000000..cae1535049d0
--- /dev/null
+++ b/dev-ruby/railties/railties-6.1.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	dev-ruby/thor:1
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3597808f9dd6..0cec5aa9ce2e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index b79e8f0b8383..f3195f7dd531 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,6 +1,8 @@
 DIST cppcheck-2.6.3.tar.gz 3880340 BLAKE2B ef83538a0aa867dd0c0bd6165b41921335256ed0372a4990ad85151ab5e87a79bde7958be43887f07a4bbf372b9992339b75ddeae7ed8ea767b83c028dfc56db SHA512 e59b4b4659c2b4fa2c16dcb548f7ee3027555dddc289ef8b54fe186af0396b6f7caa23d91bf1142ece62908b56fe9f5ba013191817322815681994093310fb37
 DIST cppcheck-2.8.1.tar.gz 3921391 BLAKE2B d61c4a8a3e88441f0a65090eddacaa34bda91ba50ce92e79c122525524368ade49d24f13f343a5a856a3014e904495e87db2d774146e871af1738d55f1a52728 SHA512 ff5a9955498101a2d061a431d0f8ed42267627b3cd029302871ee781a0e4039aa531dd47c2d44d1f3952b5e5bd3b65c9b32a10a9b1922ef466f440f8c4417e28
+DIST cppcheck-2.8.2.tar.gz 3921806 BLAKE2B b48a3f4163fec491d8a7f9eb4957a140cd33b852d1778974c383ca5148aa252cee412b4616cbf49b622ee5b4ccddcb1aa60b217284f2c01c020df606a1e4fe5b SHA512 595645cede2d1b801127747cf19c66ebc73a97c4c3f5c9af1fbf865a995f9b7ab4027a16d73cf2aa638e51569be275a26b92909d548ddb40e185978a247fb5cd
 EBUILD cppcheck-2.6.3.ebuild 2001 BLAKE2B 6229fe97e051df083a748c36d2bc606060763d9a678008c87ebcb523acc24d76a822d14e2eee7dc81d9d6e1cb10940f6a684be8fec93b01f81e49a1dcf898763 SHA512 6203a4611ce362e6e115f97c19865a24d0bc9e019e739bd01fb211b4b7457ac6a0720ff5d2b28a4accf2297767659b80e5f0d617551baea81a0ba730b6ef8869
 EBUILD cppcheck-2.8.1-r1.ebuild 2296 BLAKE2B ee4c59964cd4b6cb3b5ff46df45a4664591358bdd2b3f20f394568db62669076f711d68d3b97869b86f0171a68de74c4b5958e77e5affcf04f6d1887da57e3fa SHA512 0296ba58ba5fa1d7df9e293039515d5494884b95581ea8dafb110cfbea0970a58f496e041b5c74522d951de177a110866371c625039dcd0139bcf52e86ccf063
 EBUILD cppcheck-2.8.1.ebuild 1949 BLAKE2B 7ddf762a66c157345bcf4c78bacde9544e6de357591efceb4a47b505c19dbe54b43a3b11bd7d8e0f0d7d38773c6ede9af580c64e5e2541d4c3643c133e7baa0d SHA512 5c3da10d069a6ac582ea92b6b5a37f651e8c3ee961969d85ad0d79608b859e6e6238c295c42d920a0ba25d69fd8bbfd5ada9099a6855a38ad1ae5d9fe0d7496e
+EBUILD cppcheck-2.8.2.ebuild 2296 BLAKE2B ee4c59964cd4b6cb3b5ff46df45a4664591358bdd2b3f20f394568db62669076f711d68d3b97869b86f0171a68de74c4b5958e77e5affcf04f6d1887da57e3fa SHA512 0296ba58ba5fa1d7df9e293039515d5494884b95581ea8dafb110cfbea0970a58f496e041b5c74522d951de177a110866371c625039dcd0139bcf52e86ccf063
 MISC metadata.xml 491 BLAKE2B 614ff2cfa86224be3c758dc12d61d6bd7b6609652eee3917a97fe0ee54accee769d0c5227458e38152083d1b8f555bda2f3d23cd918eda59bd28b7c24ae07dd3 SHA512 3f4519bcce00dd2d9a05c05959db1a961d44fb899bf083600d9ba4a3af24fd9e52da4a8a6127fc1597103fe10427eeb2dcee5e227307cb564fe3fd14b33f3a07
diff --git a/dev-util/cppcheck/cppcheck-2.8.2.ebuild b/dev-util/cppcheck/cppcheck-2.8.2.ebuild
new file mode 100644
index 000000000000..9ef2ad93ab6c
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.8.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Python is used both for htmlreport (USE flag) but also for various
+# helper scripts in /usr/share/cppcheck.
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/tinyxml2:=
+	htmlreport? (
+		$(python_gen_cond_dep '
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		htmlreport? (
+			$(python_gen_cond_dep 'dev-python/unittest-or-fail[${PYTHON_USEDEP}]')
+		)
+	)
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	rm htmlreport/test_htmlreport.py || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_RULES="$(usex pcre)"
+		-DBUILD_GUI="$(usex qt5)"
+		-DFILESDIR="${EPREFIX}/usr/share/${PN}/"
+		-DENABLE_OSS_FUZZ=OFF
+		-DUSE_BUNDLED_TINYXML2=OFF
+		-DBUILD_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+python_install() {
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_python_install
+		popd || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	python_fix_shebang "${ED}"/usr/share/cppcheck/*
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/${PN}/cfg
+	doins cfg/*.cfg
+
+	if use qt5 ; then
+		dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+
+	distutils-r1_src_install
+
+	dodoc -r tools/triage
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 8743f8b7b201..6e94943e743c 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 4b0f221ada4e..466d861cec10 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -22,6 +22,7 @@ DIST git-2.35.3.tar.xz 6876328 BLAKE2B f584e9d94d167ba19bd2a00377f04eb4edf69cddb
 DIST git-2.36.0.tar.xz 7003024 BLAKE2B 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88 SHA512 dce0d7dbe684af070271830a01bf1b9cc289182f5106f6e3303b1b3a0d5dc74bebf6ac0174373db05a28f5acc62acb095bc9385dabeeecc1d6e8567dce29b766
 DIST git-2.36.1.tar.xz 7004044 BLAKE2B 99f54efb4ea1d8db0e3afd3dc9780cb37fc853e4757f4b37d68a6badd90eeed3e2943c97393eaed6adf61c82b97b5d01ca8d015784f5425072b1db14d39144ce SHA512 459432bd0c1d5a87c828a6fbf6d3473f14bf6b95783b3f27ea4f3af1ba9fd0e712a96a41276a16c6ebeb7ac3583a5f445eedd0a9e19fe160c2c8e309ec58818e
 DIST git-2.37.0.tar.xz 6978796 BLAKE2B 204a06a6d35f4f1960d031c09eeef43273982e95c5825ab813899de3d30018c9e8d88425a51ce9447d4ae6183de1270017c6e0ecc9d601df897281e107def145 SHA512 2ae3c845c9d0e0f5245e47f95c958c86a4aa2c47dfe31bff6fc81b2434d2e9402b7eced18700c04ba7158ed6a72807a81c4cde6a26dd30c969b4267b8fce4d0a
+DIST git-2.37.1.tar.xz 6980388 BLAKE2B b5423e4628f8c727aa74b3f7c7da12d46814eb45adfe84bf57e87a33e85a0a793ff690f4c1f7d2da4824bc8dd7d1df1c06cbe96adae857177d3fb204941b53ef SHA512 3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
@@ -31,6 +32,7 @@ DIST git-htmldocs-2.35.3.tar.xz 1411664 BLAKE2B c7d849b9573a257de47fc8d654f7f791
 DIST git-htmldocs-2.36.0.tar.xz 1426148 BLAKE2B ba121e8f7d6a232f3df2b5a50c0f4a798c80808562c710f306f26fa79c124e5e1580c0626a2fce04f4a17b96d40a2683809550f37028cbc436b359de91100599 SHA512 62ee14c2f1ff34c0fbdf281ea2bb08bf6a24850d1d8dc68ffb12ae15e343c167ac869559395769fb352bd441baa8f2d45d696923a04e2f04bca921c990d75a9d
 DIST git-htmldocs-2.36.1.tar.xz 1426284 BLAKE2B 2213f870b7fe35cc76ce8654ed8c50c0e9694c58acac4aa2350f826422db6bf2fc238fbd12075f98e84539fdf6ca5624984e21844d1d1c1ceb90e3b090438a7d SHA512 3aa2ca197a789161571a6961dae8c2723ff5ba05a2d8ce7443f7fd9ef46fe5a3d001364831345f3fc4e028140022d20afefbabdf4a82cdeb311167793b292c1f
 DIST git-htmldocs-2.37.0.tar.xz 1444540 BLAKE2B 9249de4b49d0812cf5f3ceb0a062b396ca4f9482232c69c75177201d19c4094ca79acb61d47c9a80f9db8749ac634bb2cc3bb2fa96bd6b4a34798cf1da2dd74c SHA512 8f9ff2bfdb55db41805f4366c6eb6f116e37774b7dbbac193c4a817357c47c44664eb69eb1b55acfaabc513dbbd2393d7a93295b4443630f65bd6791fc742a87
+DIST git-htmldocs-2.37.1.tar.xz 1445040 BLAKE2B a2f748787f8008d67ae065b3efb34b04df76d2d96ec933f4e7af8d4d2580bf9d163c52a6bfe81c030af59a61ac8e02edfca30a988f1e24b1044271869e9426df SHA512 0aba312ff889875873f91e86689b7e02f4a9953e2f9339f84a94a41ba185503dbe265547c8b4bb7f128519ae8f9f0a288903e0490af23387a5bf81e7cf3b4ddd
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
@@ -40,6 +42,7 @@ DIST git-manpages-2.35.3.tar.xz 497672 BLAKE2B aef5a7c579392f55fa63f1ce36c03579f
 DIST git-manpages-2.36.0.tar.xz 503604 BLAKE2B 438f533dce6628143c0ca348bc372017f049126933bf07a63ce9150114632a048778d8e0876970b406144aa584d512470ae4426be9c5bb8a3a581680ac9443a1 SHA512 67c2fb1c974ffe15aa09b9c36338f3ae9805573b35291e128210fc99c9fd97b1e26be571819d6b073c5adfe4c6f688c15e31790aa9eb62c1effacfb8aa21eb1c
 DIST git-manpages-2.36.1.tar.xz 503680 BLAKE2B d43fc90584b2f9e3bae30460f0c545b4fb96a5c70ad03c73d655481e5737b75a8d7a293db5bfdd752aabfc835a4a11e77474a5a0f144c8791b2dd433a3e45b70 SHA512 dd2fd6c5186aac53d7834ccf0cb6c380758624bb4583c6c5703b5b7a24c65d4199403fbcf7033c69bd3dcfbe048baaef3e886b9ba99c8afeb375e18e5b3e6e40
 DIST git-manpages-2.37.0.tar.xz 509992 BLAKE2B 67a1bc6e3a92b69d30b5e977b170cf11ac37d85dc318b35e12b728b8e17d6cfaaca7bbd343da8745be2547be8ad3dd9d930a24c0ba716dcb96aaf0610e25b11d SHA512 d739670caa11b70f3ed50665764e78a5b4c3d3d912976898d22d10d45ba3e2599b9e13d2a2502f97076a9d88b5f9e67bb11d204c8c43149b81e8243d28981711
+DIST git-manpages-2.37.1.tar.xz 510044 BLAKE2B f1f79dcbb72d05258dd30ccaf76c2726de5400555d189a112786c2cecbe5cdd27879f27335ed48c84315c496bc28aa0f95e7498ee3c2672dea3071e274a1693b SHA512 5dec5aa33e707a3c3520c6391dddc8812c3c5d5f72c13a7a5f194dac08c5b73dd59b3ab777d699fba7ef5088767ee796b12de936f196224fee0ffdc31c8b8f62
 EBUILD git-2.32.0-r1.ebuild 17396 BLAKE2B d3e72aee885b6c6f42fd8299943ef62bffa72bb6795b8d363d3f51d811643f3e497b580ba76e09041621006ac0cbb37edcbddc153c7857cae6c86ce76312aa7d SHA512 fff18efa738dbf828654033931ae7eab90e8f4995ff9033a7865559c4f0cbc270f406cd4c87c7ff9ea14af38e9a3be9c70b6254caddd98250f60ca6b6bec97eb
 EBUILD git-2.33.1.ebuild 17292 BLAKE2B 64fd297bf8d695d2f82745eec25790b26f7faa1f1c95af123cbefdc216964dbecbe2e01b2775c43d40633355b81b1d5047fd0a05d3394c1d736a25d38c7cbc55 SHA512 0379fee683ef4e83bb9d0da35a1d1e7371b3975263351fad482f14f550e17c2ea5bd6041bdd834541b585afd87136d74a8102db3205b953edbd9232a551e7221
 EBUILD git-2.34.1-r1.ebuild 17299 BLAKE2B 0b6dde0f056ea0682e71561d993ee90660753942c4e6b876af48f0c341adcac3d524ba83a948e9bda970e363e53ca0a9e057ab21a41647c4624af87994b8d0ff SHA512 154f6e0172f32906fc833e9228c95e0014fcfcfaf041dae8539c0f8113e8201bfac04a8f5299d678aab0bd05af0e96243b0c86936fba453d01ffa82ca2a335bb
@@ -50,6 +53,7 @@ EBUILD git-2.35.3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469a
 EBUILD git-2.36.0.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.36.1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-2.37.0.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
+EBUILD git-2.37.1.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a
 EBUILD git-9999-r1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r2.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
 EBUILD git-9999-r3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298
diff --git a/dev-vcs/git/git-2.37.1.ebuild b/dev-vcs/git/git-2.37.1.ebuild
new file mode 100644
index 000000000000..6b4a3f2ff057
--- /dev/null
+++ b/dev-vcs/git/git-2.37.1.ebuild
@@ -0,0 +1,641 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake DESTDIR="${D}" install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 3b5a64f7ad72..990414e0d9b4 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -2,9 +2,11 @@ DIST tig-2.5.1.tar.gz 1144666 BLAKE2B f8e96b1e27286ebebd3e3f374b28ed31a69b10bab1
 DIST tig-2.5.3.tar.gz 1165632 BLAKE2B 398174578b9723d7825c7162b59d2a1a92da161b3f3b8896c1d121ed36c8a0a1c52f676325b3a3fdd0cea9961c7f4234bd1ac594d9057cf6707cad22a3eda35b SHA512 2339c6c93808b6fbcda4ae29e014e7f4edda5f16df46e466d1d14a9f65dba10bff9df6363f37c369418336f362d5e38dbaf7fc4d99761997cc39722ba6132aec
 DIST tig-2.5.4.tar.gz 1167930 BLAKE2B 620dea0d5c4cd670b11e143195145dd268ba4762ce5b3e56a393bc6af6e508349c5f3581dff9f118d047ab8e7b431b64c85431f5af5719cbb9c63117394b265b SHA512 8c2c1d3aa980d3a6619501a770bb5210db445200e46939e2c122db1fd684ae9857eee4a06a8b6622d5d683457f11629522b121e0b429eec6d11dce4f4020dfb3
 DIST tig-2.5.5.tar.gz 1175752 BLAKE2B c77ff0990e5984df6a247cddb1729532719617178fb89143f1f78817f686cb357bc80678e8a1c245c338a40c20c69473b554d8af83381386821358495ed26f29 SHA512 63f617dfcbd89de715573caa92ca83906cefa6a5229876f1d5390b4b58442b0bec958065b798d4e81729dc87bf6dcd2a392fbbab2cd66ca16df6e2e9d6362ca3
+DIST tig-2.5.6.tar.gz 1176006 BLAKE2B eda766b32022fd6d849048107d9de90cb668ac594db1f46ee94984a5487f1a01c3109e3279c2c9e2260ef04ad7687b8c5eeb52ecf0b5e9d5c4b1f649aa23d46f SHA512 4d55061db43d64be9c97589d37305f6dcd85f1e7381012a9d61d21226dad456a86b16401fffe7763808dab62f07e17b2bcd17b9a30e1349e252be85f479e3741
 EBUILD tig-2.5.1-r1.ebuild 1292 BLAKE2B 4d3e05ff64db4eb174d646ae2e560bf3d4b1f3042c0684ead2d4476dd0aace2795b6f028e208e17f70ba02498ecb3ee05e9c92437d9df31ffbd110ab32895925 SHA512 12171f912ba5c1a6defd8d6a5abea086ff7bbed7672d6bb9b11a260eadb8709284c7abdb046c2e29bfca7492dc703a6962c4fae4cf0e0900849094cecc905139
 EBUILD tig-2.5.3-r2.ebuild 1283 BLAKE2B 6ffab61b7f4f4187a7f0b0a1559fe32789dac14caa545055703d8faec6d7ec5f9a8e405aed34f3da28caf902c13f9fca90fff733ae0842f59b4c04cf37d1bad3 SHA512 4ba1422e5e1f2ebabd9bdc8297aacba7910c298fdf2fe91ee3f8bd53fb5fef109574c0f84642a4cdd659864dc79feb009105feba24ed4aa01dd2cfbc9b24f4dc
 EBUILD tig-2.5.4-r1.ebuild 1290 BLAKE2B 8812b950ece1bcf3923758eb5ec6303163f731ec6401736b319eb875c6d9aec6bc052fb93ee7beb6cfe0f5e93eb572fa2849bd647d25c1e0114e930aac373173 SHA512 20baf997a446ceb658474166d6acf4072f7068463040b3b8abbb39a920d628dcf14615db42da21521b943b3699e7b867e64ae48f5c960ae769e3631fdfac9f31
 EBUILD tig-2.5.5.ebuild 1382 BLAKE2B dab6a6b793b4dc5194d6cd8522f36bb4f4aa75408f41d008dfaa50ced3b3479410420245da630c3a4203e27debaaff665fe4c4ea2024198cd7943f396c6b1dd3 SHA512 a9e8b466b38808e7c5cf5acc3a7d4a0b13b17ef595d6b5016e3a86d7eb0bfde98be64f9f4b8cb217cc0891a1b70c4ab67b80657dc382a16ef784da981fab6981
+EBUILD tig-2.5.6.ebuild 1387 BLAKE2B d6c8b816650720fec8b55378b82efa8b902f7bfcb956e494042ed1e966bcb8176f67251f374f006fb22b21d294ac6e9952500dad647e35c66b8ebb923afb4299 SHA512 90da86dc0394df0b870e942677a83480c157f798e463dddc63e1ff70d464ffd9632f75d0b509b36eca85ecb89559e3a3159aa09d16c58884ecdd68c2c7c746da
 EBUILD tig-9999.ebuild 1387 BLAKE2B d6c8b816650720fec8b55378b82efa8b902f7bfcb956e494042ed1e966bcb8176f67251f374f006fb22b21d294ac6e9952500dad647e35c66b8ebb923afb4299 SHA512 90da86dc0394df0b870e942677a83480c157f798e463dddc63e1ff70d464ffd9632f75d0b509b36eca85ecb89559e3a3159aa09d16c58884ecdd68c2c7c746da
 MISC metadata.xml 717 BLAKE2B c92a0b14d4fd37479475e347e4157da9c6a6d81e7d0ee6c3cf389745eacf8c3cffb32ea696e89aad73f8fd46ce64f26500c2dc26ca8b1414e76019f1268db6f5 SHA512 b0a832d79a25f6d9d8161967a4b659b32f322c7bdc2a0c0d1001d48505c516c4802f941fb433abf9a027292cf5b0dedce2dd60e5ac68a0992eb309b66cc5db39
diff --git a/dev-vcs/tig/tig-2.5.6.ebuild b/dev-vcs/tig/tig-2.5.6.ebuild
new file mode 100644
index 000000000000..656ca0a2e20b
--- /dev/null
+++ b/dev-vcs/tig/tig-2.5.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/jonas/tig.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+DESCRIPTION="text mode interface for git"
+HOMEPAGE="https://jonas.github.io/tig/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pcre test unicode"
+REQUIRED_USE="test? ( unicode )"
+
+DEPEND="
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+	pcre? ( dev-libs/libpcre2:= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+[[ ${PV} == "9999" ]] && BDEPEND+=" app-text/asciidoc app-text/xmlto"
+
+# encoding/env issues
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with pcre) \
+		$(use_with unicode ncursesw)
+}
+
+src_compile() {
+	emake V=1
+	[[ ${PV} == "9999" ]] && emake V=1 doc-man doc-html
+}
+
+src_test() {
+	# workaround parallel test failures
+	LC_ALL=en_US.utf8 emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-doc-man
+	dodoc doc/manual.html README.html NEWS.html
+	newbashcomp contrib/tig-completion.bash ${PN}
+
+	docinto examples
+	dodoc contrib/*.tigrc
+}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index bf8db46f9fcc..311b34b23ede 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/pyzor/Manifest b/mail-filter/pyzor/Manifest
index d70a288de9dc..a890071caa19 100644
--- a/mail-filter/pyzor/Manifest
+++ b/mail-filter/pyzor/Manifest
@@ -1,5 +1,5 @@
 DIST pyzor-1.0.0_p20200523.tar.gz 138077 BLAKE2B 13ad30f06ce32a24a42dd5aaa21ad2a6700df1bac3dc54a86532748688b094ee0f56a8e28e34336298388c6e0b95868e95d040866c9afa561d867069496608fe SHA512 afe3b14794aea68b1a7d72840257976c7c9f755a6f6dcaaf6ebacab465c176fe2aa84f3fe176006cdbe26ef0b07ed949f75f6ef729f65c604fadf6ce8472da8f
 DIST pyzor-1.0.0_p20211223.tar.gz 138500 BLAKE2B 242a7b2df3451f659d820771454e685868792bd2275b6d69d4c4adfd6044c781abe2d72fe1500a6074851faf8e88e95d6578c546d4d95fda03e11609d1a0b436 SHA512 218bea40515a21b1e08b2bad5b7ba339ba84fff2da425dc58df72a967730ebe10e319944e1604ff56bb37f6a8ae7bc0cd974b54b18a4878ba103131b8ea47b67
 EBUILD pyzor-1.0.0_p20200523.ebuild 1565 BLAKE2B 09a2f7abd6979ffede603c0e20f3a6656481fba2c97a67801dea217440f5e1eff9da8b0efca6ece299be75edd61072760d0dfd53f2d06785f72192c29e104354 SHA512 4c387c7cbafd33ffdc3476844e1eb7314d8b8cc8307c51c8291e270cce580845e61c98d39f4fac5661bd20a546eb44ac656f25275cd0f0e92243dd813770c3e2
-EBUILD pyzor-1.0.0_p20211223.ebuild 1547 BLAKE2B 3b38d92f56e5102b15ed42f22bef1fd70a9a4be0c35ddb4e9eab982c3cade4a6c67043d2b4fb4aafea1c2a326514608f2a62bd7c49122f76c474fc29a1140b41 SHA512 3fcbe02ac24f95f65aef53b7c80b45b73b836d8c1863a65bc2c521c685890aa016352bc2058adee7a3adbe69a12a31380b71a56dfba7eb81d66f5d0a657fd223
+EBUILD pyzor-1.0.0_p20211223.ebuild 1546 BLAKE2B 4abdac1bef59eda7fe810f296f32a990a2b6521a3d5566f830773eb0e236a404cb7237392ba35f92db9e937f964180c03dcd3cba1084f234d097ea2188cdecca SHA512 4da577dc1758a45159d30a7d388a03548f508cf90e28b15fa84b7934f264a10adc2120e25af61ca0fe285b3ccd7afda8389caff81279a53840beff2f0d0e01ae
 MISC metadata.xml 954 BLAKE2B 62c3a125c862739d03a90657b689242c2e184ffa34b63a59697053cd6385d0d0804c1fa4246146b8fbdb08563d906e4179456b21ee5371889765c53446ebb061 SHA512 1bfbaabcb0b795d2ef3dc4763a46c909c422e23bafd522e072b2d00cc374713c78c005fba26d5df6f8cbbb7a2e411fba36a7741098e17890e4a7dee83b40038f
diff --git a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
index 85182f021560..a78f097d7c8c 100644
--- a/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
+++ b/mail-filter/pyzor/pyzor-1.0.0_p20211223.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc gdbm gevent mysql pyzord redis test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 07c59bde0931..af7216c4133f 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/encodings/Manifest b/media-fonts/encodings/Manifest
index 9f01be21a4fa..af91b73f3c14 100644
--- a/media-fonts/encodings/Manifest
+++ b/media-fonts/encodings/Manifest
@@ -1,3 +1,5 @@
 DIST encodings-1.0.5.tar.bz2 713817 BLAKE2B 43e466c27fdf485e9704debb89c69a3c3eaecf84453362d86b53aa9c33d10b8f97f348ef35f8b430be101e8281ecce5d5f49a052929fc7cd37d94a7590645193 SHA512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008
+DIST encodings-1.0.6.tar.xz 312720 BLAKE2B 4649d8d12fcfcbb7de9e8bd8aa7e77514835a56990123549137b4bbe5615c1e9fcddccb13b6442d8a525efd147926801a5029cb10126462b29e31e3354da3683 SHA512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134
 EBUILD encodings-1.0.5-r1.ebuild 663 BLAKE2B d62b20760ba7f5db43696a531a08bad66f4f075f33dc64018425d04a0c522f949270066fc838e26b741e0fb1b24510fc03a721a3b5d13a92f509f776f93452e8 SHA512 4ef30bbe181a8c9e9c7d4782c9316e4d817691c2a5a8ade2906431616e8cd4fee81acd0dac104e912e09929f386dbe12cff1b0fcb9f7eff3e43fda5f7505fce2
+EBUILD encodings-1.0.6.ebuild 696 BLAKE2B d795b126965f610db0fe8f37498609f17fe71ce736e0c487094139cb7b29cf940997217554d6edda74e7880a28e85e4080476c3c6c915aa889999849682baec7 SHA512 d4c49a83d11c962c24602868e2fd1be4c00e14a08f7dbc9cc4dcbd83a48f2821b3e6080e0b7f20c686715a9979656d2317858d06430a10000d6757acc99cc396
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/encodings/encodings-1.0.6.ebuild b/media-fonts/encodings/encodings-1.0.6.ebuild
new file mode 100644
index 000000000000..ba0a1658be2f
--- /dev/null
+++ b/media-fonts/encodings/encodings-1.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# font eclass is inherited directly, since this package is a special case that
+# would greatly complicate the fonts logic of xorg-3
+XORG_TARBALL_SUFFIX="xz"
+inherit font xorg-3
+
+DESCRIPTION="X.Org font encodings"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="x11-apps/mkfontscale
+	>=media-fonts/font-util-1.1.1-r1"
+
+XORG_CONFIGURE_OPTIONS=(
+	# https://bugs.gentoo.org/815520
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+)
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index 1d353e1f7740..a6fa0110c5d8 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,5 @@
 DIST font-util-1.3.2.tar.bz2 158480 BLAKE2B 490aa54fdbf0e7060a17261e6ac06d30ef374c0ef40ae7473680c192898305c86617667c59f334d54e3ba3eb2464e925a12a5ad4bc74c73f6a62b0500d7c0da0 SHA512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167
+DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
 EBUILD font-util-1.3.2-r1.ebuild 656 BLAKE2B c9f960473fd093553a3fa24a85be7330ca006046295a12ca7318829e3c39fbd4ae4e94608db58a0b612cff92882fea108b411aa5fef2bb57bf77d3c239ff569f SHA512 47a28efdeb978c1ff1377eea887076d5a2c1202ea8ca0e061a9e0b69b5f35091a14ef627c495ffa3d77f74f8c966bb92411945d97d75e43c2e4c19bc098ed32b
+EBUILD font-util-1.3.3.ebuild 689 BLAKE2B 295a9e28e1570bf7b1b1775b3c94ea73870996d8d9a9fedf5ca42eeb85cbca9d53a3e420d15c806c8782a8ff2871ff33839c66aef5c203f0f8a53b269d948676 SHA512 3e0f0cc2fb6ed521ce834e48cf2b354634494b5229096effaf2f84a3b1dd3982847e7601c5f885c198c4955ec86e71bcd0fddb4d056c98f4a464427c0096e77c
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-util/font-util-1.3.3.ebuild b/media-fonts/font-util/font-util-1.3.3.ebuild
new file mode 100644
index 000000000000..180d08a20707
--- /dev/null
+++ b/media-fonts/font-util/font-util-1.3.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2005-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
+DESCRIPTION="X.Org font utilities"
+HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
+
+XORG_CONFIGURE_OPTIONS=(
+	--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+	--with-mapdir="${EPREFIX}"/usr/share/fonts/util
+)
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 225b6bef9a8f..cab0e06bcd8c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index 3d1a6ac569d3..2842684bec49 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,3 +1,5 @@
 DIST libffado-2.4.5.tgz 1229890 BLAKE2B 18c260b782c9a97e3f2c8689a218f7a4925158c3e3cb14987182bf04043438d1325a9ababfe29860f6769a5eeabb49a843a8d15072b24b914334c447b5c7238d SHA512 a2c1d0515e14015b7803c4d52d67605afec27ae2569888dec085375ed4a488f4885b5033369e52305e668a35289d3bd749a9babb5778df339fa93553c23af30f
+DIST libffado-2.4.6.tgz 1230455 BLAKE2B 1e86e7f9179e94c00a74514dbd7c0c299de6d1870f22c4d9ba14cb6b105b41c9dda62d19d0d660e84eee7e0f02c0bf7c44fbe58e24634ccf9cc9e41f1d38b5c2 SHA512 dac651233ea94c19834e810c64230bcbd5516de9e694ced1b6497ad927d734c527b3a556281676393674d33da768cb2431e7da1a0fdfc6ceb268e897029aa584
 EBUILD libffado-2.4.5.ebuild 2814 BLAKE2B ff17cb0a6f5b3e38f8c8d218166f50135af2d3f99ff91371273f1e82a1ea039548009f366b95a96a2fda26d575a86d07b7c884ff0d2792b04f830e67a458e1a7 SHA512 fe1530f2fc2f93e771107c08d1844e17cc9fff59f68678459ac72778f48f610318d7092c232012761084f24ef622dda729d4dde823f79c0a2c8b94f9fbaa085d
+EBUILD libffado-2.4.6.ebuild 2816 BLAKE2B e2008ce2ddc9486456bd73f5bfe4d4c021d95bab11e5ecbcde0ca78af8004b7f554f65f28ca7683566229058d8b4f42421d3b9a24cf513bd16bbb64bbd5483ed SHA512 3d6f00972f480a2d81ce54bce7e6fd0ce95fc94bebdbdea2fdbd57427cd5930b6a79f5a5a20bf1c2053ef83bd3b23d5db151331dbd76b85165c75837bd2c87f1
 MISC metadata.xml 344 BLAKE2B a7d2c27caa7e9fa72716534c406145b94bd8a13eadf57d06ea8e3148339857311bd7e8f0434edbf8a70a5e7bfec1726425e1d16734841b056caeee7754471666 SHA512 30d31f76c73ff218fa34e5f9d442e2366082bf4697038c804c093cac0e22720341691b732bf653466f8e5fc7e734c11b08a02cef7dd2a4bd93635968e2c29447
diff --git a/media-libs/libffado/libffado-2.4.6.ebuild b/media-libs/libffado/libffado-2.4.6.ebuild
new file mode 100644
index 000000000000..95f537748839
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
+else
+	SRC_URI="http://www.ffado.org/files/${P}.tgz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="${PYTHON_DEPS}
+	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+	dev-libs/dbus-c++
+	dev-libs/libconfig:=[cxx,${MULTILIB_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libiec61883[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	qt5? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
+		')
+		x11-misc/xdg-utils
+	)"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+myescons() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		UDEVDIR="$(get_udevdir)/rules.d"
+		CUSTOM_ENV=true
+		DETECT_USERSPACE_ENV=false
+		DEBUG=$(usex debug)
+		PYPKGDIR="$(python_get_sitedir)"
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=false
+		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9.
+		ENABLE_SETBUFFERSIZE_API_VER=force
+	)
+	if multilib_is_native_abi; then
+		myesconsargs+=(
+			BUILD_MIXER=$(usex qt5 true false)
+			BUILD_TESTS=$(usex test-programs)
+		)
+	else
+		myesconsargs+=(
+			BUILD_MIXER=false
+			BUILD_TESTS=false
+		)
+	fi
+	escons "${myesconsargs[@]}" "${@}"
+}
+
+src_prepare() {
+	default
+
+	# Bug #808853
+	cp "${BROOT}"/usr/share/gnuconfig/config.guess admin/ || die "Failed to update config.guess"
+
+	# Always use Qt5
+	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
+
+	# Bugs #658052, #659226
+	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC CXX
+	myescons
+}
+
+multilib_src_install() {
+	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	python_fix_shebang "${D}"
+	python_optimize "${D}"
+
+	if use qt5; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 51e769834a0c..a38b69e46c49 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 9892e4b79a78..caf8224d5352 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,5 +1,7 @@
 DIST mpg123-1.29.3.tar.bz2 1069979 BLAKE2B d01a8d77ffb6c344592d1b90026ee25ae12eb2e063446e88370e0aa508705a843b987f1a400351b5ed87d211251057b7b31a2e653401b800fe9871ac2a5756fc SHA512 0d8db63f9bae1507887bc5241a56abccfeb767b7ba8362eb0fce9de2f63369e57fdd6f25a953f8ef5f9ead4f400237db51914816e278566fdf8e6f205ebca5d6
 DIST mpg123-1.30.0.tar.bz2 1091578 BLAKE2B 6acdbfcc1119507c63d9da95afc747c43698ef385368b417e1716eadde6b74fc0618c3aa03a495e4415b5f14aef26d85f98832b3ba5f5bd17083651808a7f53b SHA512 cf508bdff1f75320c7c4d77653ba8170cc0dd8c565390cfb6ba745ce3853816071c86becff3ce304b80481d220cac2113ad244930832ccc78d3d8da74112562f
+DIST mpg123-1.30.1.tar.bz2 1092735 BLAKE2B 8ce6b964acf307ce4358b33468b7560e53024df2551a17602032260ac799d6c1ff0512cfb5fa6a59e3983c054fa82b1520f8329502fa4c351b94f66f9ccdee13 SHA512 098fcecc6a570e32ccd164b62428417186265905d148d009ea592c948a02027d67fc43e015ece21cf900008f31bbe35b3ec770faba5ae0b914db0022cb6b37fd
 EBUILD mpg123-1.29.3.ebuild 2999 BLAKE2B 179133f33e9c17de507caf6416b413808faf84a083e1cdefe6380931e21d0d368e898ad44a02fdd0d5581934712279fdb00645cb5974d5b4996fb4e21df062db SHA512 cad78654ea54c420135f2878d07825cdb3c67241fa6f376fe5828ef4c5e600bf8adcd5e1af61f430d70c2ffdd0f23f412971ef574836dd5f912266bc9dea904e
 EBUILD mpg123-1.30.0.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
+EBUILD mpg123-1.30.1.ebuild 3006 BLAKE2B 0c587a897a607c29f7192156e54618441667478361f2ea3a59b48944ab8c1a58d73ffc89b0910f227beeeb13388d3e48a4e14db2efd72f79d5e329eede813cb9 SHA512 a100bc2beb52f75de60726554a6409bb7064bb7c647103dd7061f9dd78c3095b7ba8b02a344d09225cc1ccb74569b07ba399c90f09e07b9b4e641f3009730e8e
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.30.1.ebuild b/media-sound/mpg123/mpg123-1.30.1.ebuild
new file mode 100644
index 000000000000..ccb28a07fd63
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.30.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+# Note: build system prefers libsdl2 > libsdl. We could in theory add both
+# but it's tricky when it comes to handling switching between them properly.
+# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
+RDEPEND="
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+IDEPEND="app-eselect/eselect-mpg123"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 2c539834c4f3..5befba20a90e 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7d0d12624926..5f500682e87f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jul 2022 23:39:46 +0000
+Wed, 13 Jul 2022 05:39:43 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0806c0692a96..7fc0e74392b0 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-12T23:39:51Z
+TIMESTAMP 2022-07-13T05:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOBkdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOWqVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQYg//XH/p417m/HXA7BbUX+C2FEcpPetUf9Yc8ZzmsOceGdI9lBRND6RoUQqF
-uDiFKbVsCAyq2HeqMhtP9nRQmqyRh+jvDs5O2qaNENI2vuWZt/pAQfKIr92lS7SF
-hf8QM2kgh/64P7kJSOMMwWBgkwn2g7QD11jO4c311s22IVcmHmIaVRPh6EHUtRXK
-G4DjzEaw3D3Bex9MJNASmdLe86uVgBV/aJnkx3ZKEaUlRJsT7YvgD/x+h3dZDr14
-mwAau7yMvy+RIs2uYP9KnK2xzE59K5jDXRDSapb2z4gYkLPiUvlZU9hVnLPvBDp7
-mNCjhWDuorCOO8G0irwUplj3f9VFVg3lxghVLKJOLbavp6AjG/5RSQdEg1xPfQ5m
-mMp3UYUJvUEMf/yWnmKjEgA7ebH5vubA3DFKSdh1DntuCjM10OEb/OA4lxqX4VkK
-8wex4wtEMR6xvrowvuUg0nfL/vMTr30NqfGOKP9z3Y8sHZSa1Z4y1HoYem5V21vs
-5duJfZx6shhFCTeh+9q+GDsx3MW7lrkWxV8qrFU+bVqZyMom+497E6FSU9jb4skf
-76NmLf2gHvic6yUJFTukvSBKf5H004PQTHVinf1tNL3JTz8KZ7oist2QTDhYYfSi
-Y9O8MNmjrPWcz+9fGbcxG+yyDx1XIq9rMgKKPqNOWJLfz5buNHU=
-=26kJ
+klBQGhAAgMCPxSDNEgZwEI/fOopYDLxAy4QW5JEqZjfcDFIban0s1muVGthAGdH7
+sP8X9BRBXQdRQhQIJoy/59RgIU9+mIAZyuMFZxUet7O/VYBblxrZM0IiL2X8mnsh
+dG9k76OopXVD3s9v8MH+u5ZWulGBDkmALXsQG0XfwThCd1Dxj8+RTqWTwy54H4He
+bzzRIYHusNtQ2sVz3z+reDvrmnVqPpdKjB/dx9hQRaNuZaAIy0dXgBkda6IJaYce
+skSY66ZHAMzFVEw1bCC0VU3aku4QGXckA4j3mJkTYzJJn2X+cQ3E7wwKk6yXI6xK
+NDiXteXKd99lCWyYliZNKi4iWYVWjEFYmU3LtwTki6W8+R1bH1ycxrSfQU6r0XB/
+kMKSmUk3rc85l8xfERBIE5t+k5fokVMEF7ht/Dtdavhzm9r2sJNLtgxW9k3wVj1R
+l70DPvHr+y/ns8x+jDcRMVY8tCDau0ejM25UV61L6WVm/bZdDOGyAgYWr7+upDSB
+OfFg9kuFE/r8RGpigoTCPQspbkrXzHUvQmTP3IWc7DZmc58OjDhWiCtJD1rqhncQ
+HDugq3wFYndO7ywCNh902O6/l+5EswDelK2IYm0mv5bcf9JyRWieNn25iXgy0NI4
+xhgXA+HFvx1In5NoUFxaWYE6SLX8su6wIbB/hCHAVTvcLJ7CfhA=
+=FpP1
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index bdb3ae6709c0..5f500682e87f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jul 2022 23:39:47 +0000
+Wed, 13 Jul 2022 05:39:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0ef7634fe11b..da2fd2edfa53 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 284ee7e3d206..148f0a195195 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.48.4 b/metadata/md5-cache/app-emulation/libguestfs-1.48.4
new file mode 100644
index 000000000000..0422b5ae4121
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.48.4
@@ -0,0 +1,17 @@
+BDEPEND=lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup test
+DEPEND=>=app-admin/augeas-1.8.0 app-arch/cpio app-arch/lzma app-arch/rpm app-arch/unzip[natspec] app-arch/xz-utils app-forensics/yara app-cdr/cdrtools app-crypt/gnupg >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] >=app-misc/hivex-1.3.1 dev-lang/perl:= dev-libs/libconfig:= dev-libs/libpcre2 dev-libs/libxml2:2= dev-libs/jansson:= >=dev-libs/yajl-2.0.4 net-libs/libtirpc:= sys-libs/ncurses:0= >=sys-apps/fakechroot-2.8 sys-apps/fakeroot sys-apps/file sys-devel/gettext sys-fs/squashfs-tools:* sys-libs/libcap sys-libs/readline:= virtual/acl virtual/libcrypt:= erlang? ( dev-lang/erlang ) 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_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) fuse? ( sys-fs/fuse:= ) gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) libvirt? ( app-emulation/libvirt ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) selinux? ( sys-libs/libselinux:= sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) >=dev-lang/ocaml-4.03:=[ocamlopt] dev-util/gperf dev-ml/findlib[ocamlopt] doc? ( app-text/po4a ) ocaml? ( dev-ml/ounit2[ocamlopt] || ( <dev-ml/ocaml-gettext-0.4.2 dev-ml/ocaml-gettext-stub[ocamlopt] ) ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) )
+DESCRIPTION=Tools for accessing, inspecting, and modifying virtual machine (VM) disk images
+EAPI=7
+HOMEPAGE=https://libguestfs.org/
+INHERIT=autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs
+IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua +ocaml +perl python ruby selinux static-libs systemtap test +lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=app-admin/augeas-1.8.0 app-arch/cpio app-arch/lzma app-arch/rpm app-arch/unzip[natspec] app-arch/xz-utils app-forensics/yara app-cdr/cdrtools app-crypt/gnupg >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] >=app-misc/hivex-1.3.1 dev-lang/perl:= dev-libs/libconfig:= dev-libs/libpcre2 dev-libs/libxml2:2= dev-libs/jansson:= >=dev-libs/yajl-2.0.4 net-libs/libtirpc:= sys-libs/ncurses:0= >=sys-apps/fakechroot-2.8 sys-apps/fakeroot sys-apps/file sys-devel/gettext sys-fs/squashfs-tools:* sys-libs/libcap sys-libs/readline:= virtual/acl virtual/libcrypt:= erlang? ( dev-lang/erlang ) 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_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) fuse? ( sys-fs/fuse:= ) gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) libvirt? ( app-emulation/libvirt ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) selinux? ( sys-libs/libselinux:= sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) app-emulation/libguestfs-appliance acct-group/kvm
+REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=0/1.48
+SRC_URI=https://libguestfs.org/download/1.48-stable/libguestfs-1.48.4.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=fa898b98d072edca485a8f175e1941c9
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
index a518e82bac3f..588c62304873 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
@@ -10,4 +10,4 @@ RDEPEND=!<app-emulation/libguestfs-1.46.0
 SLOT=0
 SRC_URI=https://libguestfs.org/download/binaries/appliance/appliance-1.46.0.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c
-_md5_=a8c99c485600f16a9b62c95cd7a7a548
+_md5_=0c33b3f3321d2da702d6f4661b302eea
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3738b69d2df5..16a89d2cd3ff 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.3.2 b/metadata/md5-cache/dev-libs/libgit2-1.3.2
index d62dd1135cd4..9adaaf81a549 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.3.2
+++ b/metadata/md5-cache/dev-libs/libgit2-1.3.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libgit2.org/
 INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-libs/libpcre:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.3.2.tar.gz -> libgit2-1.3.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2591ec5edabc153036c3da762ab58340
+_md5_=f6075f5469e80eba2742367567eca12d
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.4.4 b/metadata/md5-cache/dev-libs/libgit2-1.4.4
index ce1a2bb6175e..b7d4afb47f65 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.4.4
+++ b/metadata/md5-cache/dev-libs/libgit2-1.4.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libgit2.org/
 INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
-KEYWORDS=~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.4.4.tar.gz -> libgit2-1.4.4.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=323516b2013b60e88b10893b99374144
+_md5_=1f8fedd8cf624316a27c093d82c87092
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 82f179b281e8..d8c040907642 100644
--- a/metadata/md5-cache/dev-ml/Manifest.gz
+++ b/metadata/md5-cache/dev-ml/Manifest.gz
diff --git a/metadata/md5-cache/dev-ml/gapi-ocaml-0.4.2-r1 b/metadata/md5-cache/dev-ml/gapi-ocaml-0.4.2-r1
new file mode 100644
index 000000000000..d74e3bbefddf
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/gapi-ocaml-0.4.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/ocurl:= >=dev-ml/ocamlnet-4.1.4:= dev-ml/cryptokit:= <dev-ml/yojson-2:= test? ( dev-ml/ounit2 ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:= >=dev-ml/findlib-1.0.4-r1[ocamlopt?]
+DESCRIPTION=A simple OCaml client for Google Services
+EAPI=7
+HOMEPAGE=https://opam.ocaml.org/packages/gapi-ocaml/ https://github.com/astrada/gapi-ocaml
+INHERIT=dune findlib
+IUSE=ocamlopt test +ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-ml/ocurl:= >=dev-ml/ocamlnet-4.1.4:= dev-ml/cryptokit:= <dev-ml/yojson-2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:= dev-lang/ocaml:=[ocamlopt?]
+RESTRICT=!test? ( test )
+SLOT=0/0.4.2
+SRC_URI=https://github.com/astrada/gapi-ocaml/archive/v0.4.2.tar.gz -> gapi-ocaml-0.4.2.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	findlib	d8fa93cf137156660d0b72144b1e31d9	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=e08795532ef1c18f241fe67b3d3d8e10
diff --git a/metadata/md5-cache/dev-ml/ocamlfuse-2.7.1_p7-r1 b/metadata/md5-cache/dev-ml/ocamlfuse-2.7.1_p7-r1
new file mode 100644
index 000000000000..53dd3c8245eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocamlfuse-2.7.1_p7-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune-configurator dev-ml/opam dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=dev-ml/camlidl:= sys-fs/fuse:0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=OCaml binding for fuse
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/ocamlfuse/ https://github.com/astrada/ocamlfuse https://opam.ocaml.org/packages/ocamlfuse
+INHERIT=dune toolchain-funcs
+IUSE=ocamlopt
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-ml/camlidl:= sys-fs/fuse:0 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/2.7.1_p7
+SRC_URI=https://github.com/astrada/ocamlfuse/archive/v2.7.1_cvs7.tar.gz -> ocamlfuse-2.7.1_p7-r1.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=bb8d8466ca8906b2134924eb13e545be
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 314aebaf69b6..778252dd14b5 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1 b/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1
new file mode 100644
index 000000000000..2fe3179f5876
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actioncable-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Integrated WebSockets for Rails
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e2df09a774273360f5fa7bb24bdaf440
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1
new file mode 100644
index 000000000000..66d4b4db601d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rexml[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=199caa3c310bdba631da14049d6461b9
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1
new file mode 100644
index 000000000000..6f66970f7589
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionmailer-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Framework for designing email-service layers
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0683d1d03e7661a60982112e2c97e77f
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1
new file mode 100644
index 000000000000..b1cff38876eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionpack-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Eases web-request routing, handling, and response
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a4b8dacc822ddf6d8e38789bf6152cc2
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1 b/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1
new file mode 100644
index 000000000000..86f225f8f368
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actiontext-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Edit and display rich text in Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=918a40b7a7ef5d11b3cf7d067b99f33c
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.6.1 b/metadata/md5-cache/dev-ruby/actionview-6.1.6.1
new file mode 100644
index 000000000000..43bf692fde6e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/actionview-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=0444dcb96e929bf1aac61dbd90738151
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.6.1 b/metadata/md5-cache/dev-ruby/activejob-6.1.6.1
new file mode 100644
index 000000000000..4cbde4d9f994
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activejob-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Job framework with pluggable queues
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=18426ae0fca3b3594dd7b820cfd5a8a1
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1 b/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1
new file mode 100644
index 000000000000..988b2432e481
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activemodel-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5b6af3755e7fb4765a00cf4f0dfe81c3
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1 b/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1
new file mode 100644
index 000000000000..9b52f279c9c9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activerecord-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails/
+INHERIT=ruby-fakegem
+IUSE=mysql postgres sqlite test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=2b749196966197e40b609bb497ff6c08
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1 b/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1
new file mode 100644
index 000000000000..2a4c27db2cbb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activestorage-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Attach cloud and local files in Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6ea36ad43777457cd414aa323bf7b6bf
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1 b/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1
new file mode 100644
index 000000000000..730c977cd7af
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] dev-ruby/connection_pool[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rexml[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby31(-)] dev-ruby/connection_pool[ruby_targets_ruby31(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby31(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby31(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rexml[ruby_targets_ruby31(-)] dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Utility Classes and Extension to the Standard Library
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby31(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby31(-)] dev-ruby/tzinfo:2[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby31(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=53d9ed44dce5a11e5cfc379cf14c0d76
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.6.1 b/metadata/md5-cache/dev-ruby/rails-6.1.6.1
new file mode 100644
index 000000000000..70c2f2453631
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rails-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=ruby on rails is a web-application and persistance framework
+EAPI=8
+HOMEPAGE=https://rubyonrails.org
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activejob-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/railties-6.1.6.1[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://rubygems.org/gems/rails-6.1.6.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=1e8420f07c9e57a507b6816cb8bf6bc2
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.6.1 b/metadata/md5-cache/dev-ruby/railties-6.1.6.1
new file mode 100644
index 000000000000..8e1c688f6067
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/railties-6.1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Tools for creating, working with, and running Rails applications
+EAPI=8
+HOMEPAGE=https://github.com/rails/rails
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-6.1.6.1[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-6.1.6.1[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.1
+SRC_URI=https://github.com/rails/rails/archive/v6.1.6.1.tar.gz -> rails-6.1.6.1.tgz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	a903a55f81825a114c1845d128a33cd4	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=31a962bf1ab595518066a192035a6756
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9e3bef03860a..84b1392311e5 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/cppcheck-2.8.2 b/metadata/md5-cache/dev-util/cppcheck-2.8.2
new file mode 100644
index 000000000000..f8ef338fbb44
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cppcheck-2.8.2
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) test? ( htmlreport? ( python_single_target_python3_8? ( dev-python/unittest-or-fail[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/tinyxml2:= htmlreport? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 )
+DESCRIPTION=Static analyzer of C/C++ code
+EAPI=8
+HOMEPAGE=https://github.com/danmar/cppcheck
+INHERIT=distutils-r1 cmake
+IUSE=htmlreport pcre qt5 test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/tinyxml2:= htmlreport? ( python_single_target_python3_8? ( dev-python/pygments[python_targets_python3_8(-)] dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygments[python_targets_python3_9(-)] dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygments[python_targets_python3_10(-)] dev-python/setuptools[python_targets_python3_10(-)] ) ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp dev-qt/qtprintsupport:5 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/danmar/cppcheck/archive/refs/tags/2.8.2.tar.gz -> cppcheck-2.8.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fc176e0af4bed409e998582fc1a560c1
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 78227a0dc542..c40a6075a97f 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.37.1 b/metadata/md5-cache/dev-vcs/git-2.37.1
new file mode 100644
index 000000000000..5a80282a1fa3
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.37.1
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs perl-module bash-completion-r1 plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 selinux subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) selinux? ( sec-policy/selinux-git )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.37.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.37.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.37.1.tar.xz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	95b2df43c5f3057b6e77bd00b4d953da	perl-module	f2c1b0dd41761ffc8441cd041e4bb7ec	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=db5d9d865ae926f12e2c455698c61025
diff --git a/metadata/md5-cache/dev-vcs/tig-2.5.6 b/metadata/md5-cache/dev-vcs/tig-2.5.6
new file mode 100644
index 000000000000..68daa4b540be
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tig-2.5.6
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= pcre? ( dev-libs/libpcre2:= )
+DESCRIPTION=text mode interface for git
+EAPI=8
+HOMEPAGE=https://jonas.github.io/tig/
+INHERIT=bash-completion-r1
+IUSE=pcre test unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:=[unicode(+)?] sys-libs/readline:0= pcre? ( dev-libs/libpcre2:= ) dev-vcs/git
+REQUIRED_USE=test? ( unicode )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/jonas/tig/releases/download/tig-2.5.6/tig-2.5.6.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=e31b6f2b33946a58880511507be4d715
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index ba25d3ec03b7..1129cad4af2f 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223 b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
index fc3477961eb5..f14779ce41ce 100644
--- a/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
+++ b/metadata/md5-cache/mail-filter/pyzor-1.0.0_p20211223
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/SpamExperts/pyzor
 INHERIT=distutils-r1
 IUSE=doc gdbm gevent mysql pyzord redis test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=pyzord? ( gdbm? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[gdbm] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[gdbm] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[gdbm] ) ) gevent? ( dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) mysql? ( dev-python/mysqlclient[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) redis? ( dev-python/redis-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/2dbe627c1ec245db206cdc73bf1f9d785f1512d8.tar.gz -> pyzor-1.0.0_p20211223.tar.gz
 _eclasses_=distutils-r1	a012c7f8c0a9dddadb3a4f56364c8f62	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=5ae5d26f68a89f62baa7e452a165b94d
+_md5_=39445de1af43e46bd794d8cc04ca1064
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 055882f352bf..577027c29f29 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/encodings-1.0.6 b/metadata/md5-cache/media-fonts/encodings-1.0.6
new file mode 100644
index 000000000000..c9607fff10cf
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/encodings-1.0.6
@@ -0,0 +1,12 @@
+BDEPEND=x11-apps/mkfontscale >=media-fonts/font-util-1.1.1-r1 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=X.Org font encodings
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/encodings
+INHERIT=font xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/encodings-1.0.6.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	font	d31f12a0f6e13d56dc3062e76ae58a61	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=1f1175f39167e83c20df84f4b8629ea9
diff --git a/metadata/md5-cache/media-fonts/font-util-1.3.3 b/metadata/md5-cache/media-fonts/font-util-1.3.3
new file mode 100644
index 000000000000..5ebbe3847c6c
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/font-util-1.3.3
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DESCRIPTION=X.Org font utilities
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/font/font-util-1.3.3.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=ace7c438a4e148ee39276e25c12659b4
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 93dc404686cf..41dacc247ef1 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.6 b/metadata/md5-cache/media-libs/libffado-2.4.6
new file mode 100644
index 000000000000..b39011e2cadf
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libffado-2.4.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/scons[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig:=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/PyQt5[dbus,python_targets_python3_10(-)] ) x11-misc/xdg-utils )
+DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
+EAPI=7
+HOMEPAGE=http://www.ffado.org
+INHERIT=desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+IUSE=debug qt5 test-programs python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig:=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/PyQt5[dbus,python_targets_python3_10(-)] ) x11-misc/xdg-utils )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=http://www.ffado.org/files/libffado-2.4.6.tgz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=606b6a7fe03719870c53da439b422825
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 6cd776c5abcb..faf5b8588728 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/mpg123-1.30.1 b/metadata/md5-cache/media-sound/mpg123-1.30.1
new file mode 100644
index 000000000000..0b77b4ef65d2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpg123-1.30.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
+DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
+EAPI=8
+HOMEPAGE=https://www.mpg123.org/
+IDEPEND=app-eselect/eselect-mpg123
+INHERIT=flag-o-matic toolchain-funcs libtool multilib-minimal
+IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl2 )
+SLOT=0
+SRC_URI=https://www.mpg123.org/download/mpg123-1.30.1.tar.bz2
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=6c399a29d61ff4ea1533b0296fd9c8ba
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0b9af93d8685..c80e568812d9 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.5 b/metadata/md5-cache/net-libs/uhttpmock-0.5.5
new file mode 100644
index 000000000000..4537955e55af
--- /dev/null
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/gtk-doc-am-1.14 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.38.0:2 >=net-libs/libsoup-2.47.3:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) )
+DESCRIPTION=HTTP web service mocking library
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/pwithnall/uhttpmock
+INHERIT=gnome.org meson vala
+IUSE=gtk-doc +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.38.0:2 >=net-libs/libsoup-2.47.3:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=https://gitlab.freedesktop.org/pwithnall/uhttpmock/-/archive/0.5.5/uhttpmock-0.5.5.tar.bz2
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8
+_md5_=b1bbb54db4c0c870286b47d71f05d7a8
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 23b07c1a639a..cf0cc223e043 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20220711 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20220711
new file mode 100644
index 000000000000..23eb383001f6
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-20220711
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/python-gnupg[python_targets_python3_9(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Gentoo Authority Keys (GLEP 79)
+EAPI=8
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+INHERIT=edo python-any-r1
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=public-domain
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://qa-reports.gentoo.org/output/keys/active-devs-20220711.gpg -> openpgp-keys-gentoo-developers-20220711-active-devs.gpg
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=39b1ce702791738a1c5620a2aee4a573
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-99999999 b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-99999999
new file mode 100644
index 000000000000..d56195eef8dc
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-gentoo-developers-99999999
@@ -0,0 +1,14 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/python-gnupg[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/python-gnupg[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/python-gnupg[python_targets_python3_9(-)] ) ) sec-keys/openpgp-keys-gentoo-auth test? ( app-crypt/gnupg )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Gentoo Authority Keys (GLEP 79)
+EAPI=8
+HOMEPAGE=https://www.gentoo.org/downloads/signatures/
+INHERIT=edo python-any-r1
+IUSE=test
+LICENSE=public-domain
+PROPERTIES=live
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://qa-reports.gentoo.org/output/active-devs.gpg -> openpgp-keys-gentoo-developers-99999999-active-devs.gpg
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=412dfb48eaead4b98f1286ae1e08b459
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d6d5ef4c4351..afe35b286982 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.9 b/metadata/md5-cache/sys-cluster/ceph-16.2.9
deleted file mode 100644
index 640e24f68148..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.9
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
-KEYWORDS=amd64 ~arm64 ~ppc64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_10 || ( python_targets_python3_8 python_targets_python3_9 ) )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.9.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cd49acf4e9bbbcc150ad7db136727c4f
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.9-r1 b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r1
new file mode 100644
index 000000000000..cbfbcfa986e3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r1
@@ -0,0 +1,17 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
+KEYWORDS=amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_10 || ( python_targets_python3_8 python_targets_python3_9 ) )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.9.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fde42ae6bca74726d8d4f1c2bff14a2b
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.1 b/metadata/md5-cache/sys-cluster/ceph-17.2.1
deleted file mode 100644
index fd5e1e6a3f4a..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=8
-HOMEPAGE=https://ceph.com/
-INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
-IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
-RESTRICT=!test? ( test ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.1.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.1.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=25da36f8c56f075523ed6ffa0b2ce60e
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.1-r1 b/metadata/md5-cache/sys-cluster/ceph-17.2.1-r1
new file mode 100644
index 000000000000..a0a14938f2d1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=amd64? ( dev-lang/nasm ) x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx dev-util/gperf dev-util/ragel dev-util/valgrind sys-apps/coreutils sys-apps/grep sys-apps/sed sys-apps/util-linux sys-apps/which sys-devel/bc sys-devel/patch virtual/pkgconfig jaeger? ( sys-devel/bison sys-devel/flex ) test? ( dev-util/cunit dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/grep[pcre] sys-fs/btrfs-progs ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=8
+HOMEPAGE=https://ceph.com/
+INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
+IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.1.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	e2883e4f04f0503cdf7f2954e2bf5e15	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1c270e80e5a49558641ddaeba70ba148
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 9f13aebb90f6..4420bafb5822 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/wordpress-6.0 b/metadata/md5-cache/www-apps/wordpress-6.0.1
index b051de1a646b..d1cd64067975 100644
--- a/metadata/md5-cache/www-apps/wordpress-6.0
+++ b/metadata/md5-cache/www-apps/wordpress-6.0.1
@@ -8,7 +8,7 @@ IUSE=+akismet examples +themes vhosts vhosts
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) app-admin/webapp-config
-SLOT=6.0
-SRC_URI=https://wordpress.org/wordpress-6.0.tar.gz
+SLOT=6.0.1
+SRC_URI=https://wordpress.org/wordpress-6.0.1.tar.gz
 _eclasses_=webapp	d872f28d7595b70dd46545199ef35fb0
 _md5_=6b4149129331ab80a0a39a830bfcbb06
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index b1e300cb2681..cbf47279b401 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xev-1.2.5 b/metadata/md5-cache/x11-apps/xev-1.2.5
new file mode 100644
index 000000000000..d1c0684fc5ae
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xev-1.2.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto
+DESCRIPTION=Print contents of X events
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xev
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xev-1.2.5.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=7d29bda1efa17788a0d27429a10515dd
diff --git a/metadata/md5-cache/x11-apps/xkbutils-1.0.5 b/metadata/md5-cache/x11-apps/xkbutils-1.0.5
new file mode 100644
index 000000000000..eb140940ed45
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xkbutils-1.0.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw x11-base/xorg-proto
+DESCRIPTION=X.Org xkbutils application
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkbutils
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXaw
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xkbutils-1.0.5.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=7b44ca4ad557e37a1bd0bd5dcdad6f97
diff --git a/metadata/md5-cache/x11-apps/xmag-1.0.7 b/metadata/md5-cache/x11-apps/xmag-1.0.7
new file mode 100644
index 000000000000..6a9fafa47e73
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xmag-1.0.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=X.Org xmag application
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmag
+INHERIT=xorg-3
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xmag-1.0.7.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=c295cd673bfd30063a0f4c596847b12e
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.6 b/metadata/md5-cache/x11-apps/xmessage-1.0.6
new file mode 100644
index 000000000000..f840166d27a5
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xmessage-1.0.6
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=display a message or query in a window (X-based /bin/echo)
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmessage
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXt
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.6.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=bb29e6344b0830034428c8bef9aa1798
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.7 b/metadata/md5-cache/x11-apps/xrefresh-1.0.7
new file mode 100644
index 000000000000..f0e5fbc00fff
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xrefresh-1.0.7
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=refresh all or part of an X screen
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
+INHERIT=xorg-3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.7.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=5dbbf57fc16fa92ab104f56dd4604a09
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index 920900ce3416..330d7e19ec2e 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.4 b/metadata/md5-cache/x11-base/xorg-server-21.1.4
new file mode 100644
index 000000000000..8623e7728738
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.4
@@ -0,0 +1,18 @@
+BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
+DESCRIPTION=X.Org X servers
+EAPI=8
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
+INHERIT=xorg-3 meson
+IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0/21.1.4
+SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.4.tar.xz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=d0e40885a084795f9df00f13c930e012
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 12495519bfc1..78e4fa1273e2 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util
+DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
 DESCRIPTION=X.Org X servers
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 INHERIT=xorg-3 meson
 IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
 PROPERTIES=live
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
 REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	d2463997f7fda5cfc20b4c390039a361
-_md5_=75c045fbc6bee93679619d474f0e6f84
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xorg-3	d2463997f7fda5cfc20b4c390039a361
+_md5_=d0e40885a084795f9df00f13c930e012
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.3 b/metadata/md5-cache/x11-base/xwayland-22.1.3
new file mode 100644
index 000000000000..1151b0e0757e
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.3
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
+DESCRIPTION=Standalone X server running under Wayland
+EAPI=8
+HOMEPAGE=https://wayland.freedesktop.org/xserver.html
+INHERIT=meson
+IUSE=selinux video_cards_nvidia unwind xcsecurity
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.3.tar.xz
+_eclasses_=meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=eef35da6e842e56a006c53a8511bc9ff
diff --git a/metadata/md5-cache/x11-base/xwayland-9999 b/metadata/md5-cache/x11-base/xwayland-9999
index ad74f3113dfc..6874934b08e2 100644
--- a/metadata/md5-cache/x11-base/xwayland-9999
+++ b/metadata/md5-cache/x11-base/xwayland-9999
@@ -2,7 +2,7 @@ BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.59.4 >=dev-ut
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
 DESCRIPTION=Standalone X server running under Wayland
-EAPI=7
+EAPI=8
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson git-r3
 IUSE=selinux video_cards_nvidia unwind xcsecurity
@@ -10,5 +10,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
-_md5_=a5a53d25dac8c68870724af419869e63
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	2cc95670908abda0d67e9e16a6b4341e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=5395d85e9dd1da82fff875a98f952f31
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index cceba659739e..a486bd2dec42 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-12T23:39:51Z
+TIMESTAMP 2022-07-13T05:39:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOBkdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLOWqVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBFMRAAjuRsc13ME1WSknd9+kiQrxdnsimYuLss9tfZRuUjf05Zt7IymlBaeZRT
-XkelHQkJXw81tOBIiD+lZrY6idTT3KMKJ1IB3L9GfNtsHw0p89EdQlJ8He84XM/0
-FFzrXK8G6Xm8eCtOW8QgMi9a4BQK1TOkwTLY404tg7CpGgqhapJ5VzSUZd185qTd
-6ihIwupqGyS8GNw2crLmr1wzp9fF7qtchVYAhj7rR5oUydkci5Mzxl58ONhp21fL
-dgKqV6WojHT4ZoCBY5UqMYt4mTdR5WItjoPhMHb+95gZ/ofaqzsvZT1SYv4I/7Qt
-LaVcd4XMyV5nDP7kHpIgqKnrDJC7MzN1WOXU433/oPvbCS0DwU8YIeJ/SwduqAA3
-zoa/+aYm4e1khH8t6aho+n47IbhHWugzH9usYjsyEv0IqIFqhVgrd4tfJW6GPVLJ
-FRUOQWBCXaSbHJ46GOTQeyq5ZeBagrEDdl0qqvlUrz1YUy2NWDqYZK7MgYvYzJnr
-gy156tNMKngEvxPEluiIPrN7GutF1xowt/LftgvjNGu1yGWSnWmWaj5B0z2r/D0l
-m7gSOxG/v5Z58HqN7sgRBD9T8C83bL9TnxZTcVgq3syCpuyBmpmnLCd3pqg1GydS
-ORvipRZXOrKJBzxpWeZXcSzmV2KQuIvy6vJAPdq4CZmJNWPSZcQ=
-=2nYQ
+klBp9A/9FZ1zPtygDjEOpfe7cd6ZkoK/YdXYGo+wPaS/tZz8BLmuwxnCUe4+RVR/
+57vRSsRZIUKhJwtvdOTMLhGs6yj+WeihW1gNFU+tPyB3ygYLeGpmM3OOhcEtLMF0
+WzrgyTNspBYwfRPWomFe/AzNoe3dt9nQOfJkrHLmBSV1/zxPdlAnMiLvQVx5zf2A
+9ocU47UnegZgRc7GDE5eufLEWnaTYGU/PMYUOFDpti//YFze/YUdzfEpPkxHucd3
+md7zEhDqHFQDILn0BOc4cj+NEiWSwdioTvrFOz/obuqLOpQbrNiStduGVPuqtqmF
+dlBUPvUCDZNjOBbVyrXMfOi6TQxUTq8yAtMRAVqvIZMw92g8LtfifLyAnxwdhOBc
+SRooy34q5NSIhQ1dkElkLBfofTkZN7hQ6OIOgeJdQUn2BTT/INf+rrIXhijsYu95
+38SL1h8ImKJazys68+UUwA/RtYB6gXBX6pJPWcmknqQDpgP3SyrgOMDTaCI05WM7
+xczlXpQ1ZFRJIybBLBZxg9vt48RPcG2C+CIfEp6P3C0sfP5wfUFphI5QLMIxCzJA
+mtWWBSQ5ckTWc6xdvAArJTahnrduRtqURGLqGH5GKbFu2c9o2BvC55T4GOh5dJm1
+hhkS+kdNNAmvceFC0bIKCu6kE3uuaOAiDKODYxmv64SSPhnWyZg=
+=4sMu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bdb3ae6709c0..5f500682e87f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jul 2022 23:39:47 +0000
+Wed, 13 Jul 2022 05:39:43 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bae541d81728..9c75ff5a34ee 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 12 11:39:46 PM UTC 2022
+Wed Jul 13 05:39:43 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e66e932eb4a2..daee71d4c1fd 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jul 2022 23:45:01 +0000
+Wed, 13 Jul 2022 05:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7fc6bc416524..4576feb8f045 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2deef683233ea5ae0b855da925d4b935ae0e626c 1657668212 2022-07-12T23:23:32+00:00
+fec3e2ee289224c1e148657b29cc8b59cf59191c 1657690042 2022-07-13T05:27:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c0a9fb86e3ea..12faa3f475f9 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657669201 Tue 12 Jul 2022 11:40:01 PM UTC
+1657690801 Wed 13 Jul 2022 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7d0d12624926..5f500682e87f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 12 Jul 2022 23:39:46 +0000
+Wed, 13 Jul 2022 05:39:43 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8de20ff092af..f77ba78ebca3 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/uhttpmock/Manifest b/net-libs/uhttpmock/Manifest
index 768489970763..1ca324fe4203 100644
--- a/net-libs/uhttpmock/Manifest
+++ b/net-libs/uhttpmock/Manifest
@@ -1,3 +1,5 @@
 DIST uhttpmock-0.5.3.tar.xz 318708 BLAKE2B 7bd257fbc8869ce2d55070bc1f84f0d34c999cd55ba5e09a54031ea391c3c65bb149d48f2ab1ab9de93acac98783ad0e7d5fca4d86dda055d4a5a3407f5ba4ee SHA512 9fccdb58ce04c1615d47bafac275c632f161a8148f0af82447286d0017d6b3946145b8a289f9abb55842bf4610ca3e5f2484bf322fb7a33dce42b3ebed45b2ee
+DIST uhttpmock-0.5.5.tar.bz2 47013 BLAKE2B 1b59801c13909525e05ec88f5ccfde1606cf427fc41896b14411344281046148bbe652162726aa643610bda447d04c64041a292b46838a3b98b849d670ce6909 SHA512 0fa6e03095c7b66ebd02736b95222b66e1232e5854839a352ee2ec59822ab027bdcf6c871b23433da46725a9807232b0b6bdd0c4cb8a59a23604787acd3d5f0f
 EBUILD uhttpmock-0.5.3.ebuild 951 BLAKE2B deebdde5fe5ea3bb4c52e702d7c31bc8b9ff4a02f8eb57c6fdd9e807b40703efb695db748857a5312e3a6c9709b3d29fb43995968f9548c4d2e3072deb8679e8 SHA512 0cef7db098128365115e38704fda13238d14d628873542945f5418de6d46bc68edc461c58b1ff5a6669d609716cbe458ff1b18169ac3ab9d7245d8f8a10908f1
+EBUILD uhttpmock-0.5.5.ebuild 972 BLAKE2B a1c94a62f2c49dac088e338d2a9da4bdb89e17b6861014d53bb0eb17f9d09313bf015cf30974a3bed936a1aa279b21f1f852fa048af7899cf184aceff7e378a6 SHA512 63ccd00a4c3437ce5dd48d979fdcdb35b29deb3a60bf1b81b39132a91f5fd4962e61de9710dd9dec0413d146fc608d757663705260e4e35c7dbd8cd44b8c72e4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild
new file mode 100644
index 000000000000..5119b778510b
--- /dev/null
+++ b/net-libs/uhttpmock/uhttpmock-0.5.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala
+
+DESCRIPTION="HTTP web service mocking library"
+HOMEPAGE="https://gitlab.freedesktop.org/pwithnall/uhttpmock"
+SRC_URI="https://gitlab.freedesktop.org/pwithnall/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="gtk-doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38.0:2
+	>=net-libs/libsoup-2.47.3:2.4
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_feature vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index cd569854fc61..5b3de575e7e5 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest
new file mode 100644
index 000000000000..6f9917743716
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest
@@ -0,0 +1,6 @@
+AUX keyring-mangler.py 3005 BLAKE2B e5435432b79156c26120af950f46f9a916af7261a78b40081eb140e18b3fd4f0d2ce55cd2ed305bdd4f60b569edfb513c1151a6255838a750d37225715e87e4f SHA512 bd4dc3dee66c0f0b8b657da1fabfbda96ea03b77d1080fa1d07b14d2a9571fe91f7589131893b75548122e772678760c7722fd8a46e120c40d8dbb8cb4341dc9
+DIST openpgp-keys-gentoo-developers-20220711-active-devs.gpg 3237775 BLAKE2B 511e4ea8907593b5ed05c79a0bf6ae131856f0511f3f6a744f393a077ad25fe3f6780caac60d4f94965d4c0aa14debae068599f50920caeaad44303a844bf7ed SHA512 c0122037a3bfde1eec0c3ca7a303ff82f532c518427b34814c12949572c18537f617db22563c15d40fd41f0c94e6c50bcd3e0d3d7d1175400057aafbe41ae2b2
+DIST openpgp-keys-gentoo-developers-99999999-active-devs.gpg 3237775 BLAKE2B 511e4ea8907593b5ed05c79a0bf6ae131856f0511f3f6a744f393a077ad25fe3f6780caac60d4f94965d4c0aa14debae068599f50920caeaad44303a844bf7ed SHA512 c0122037a3bfde1eec0c3ca7a303ff82f532c518427b34814c12949572c18537f617db22563c15d40fd41f0c94e6c50bcd3e0d3d7d1175400057aafbe41ae2b2
+EBUILD openpgp-keys-gentoo-developers-20220711.ebuild 7250 BLAKE2B 4e1a2d11e880c008e0d52c8677403f646bb883177e9b46f6acf0ee9eedc02fb556bc8769154ab1bf2c7819fa698ab2b23492b0984af738bf8c6c11e1d4dee325 SHA512 369a181fcf1dc1a07a2250c0e023a4572dc79e46b28a9b9ce20c64891d40066dc584fb89f0efb11927971e7635d1ead5a9bc9acb605d61347dc6fbd7a3ccaa6b
+EBUILD openpgp-keys-gentoo-developers-99999999.ebuild 7275 BLAKE2B c23960a12c13cc5d404dc225c11e840cc9214b4632418441ab4822d1040ed381efe3de3acbd68554249d8061d8b1e8342a786bcf76969bd2aa87933a49397cfc SHA512 4c0051b7850b38d1fd7449d276262004ee55fddabd70547c2a355f47a419beb97a12a462ab555c2fba9e5b96412ac01bfea020a0decb8b2cdc805150fad4ae37
+MISC metadata.xml 264 BLAKE2B 630ac0044f623dc63de725aae23da036b649a2d65331c06fbe9eb66d18ad1a4d3fd804cdffc4703500662b01272063af346680d2550f2fb6a262d6acee8c6789 SHA512 3cf1981080b4a7634537d20a3e837fa802c52ae5ee750531cc4aa3f8478cda78579375602bc058abbd75f9393f9681b79603c3ddd9af809a1e72f7336a708056
diff --git a/sec-keys/openpgp-keys-gentoo-developers/files/keyring-mangler.py b/sec-keys/openpgp-keys-gentoo-developers/files/keyring-mangler.py
new file mode 100644
index 000000000000..3100e6226375
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/files/keyring-mangler.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+#
+# Distributed under the terms of the GNU General Public License v2
+#
+# Takes as input:
+# 1. authority keys as gentoo-auth.asc (sec-keys/openpgp-keys-gentoo-auth);
+# 2. a downloaded, unverified bundle of active developers from qa-reports.gentoo.org (https://qa-reports.gentoo.org/output/active-devs.gpg);
+#    but this must be converted to ASCII first(!), and
+# 3. an output file (armored).
+#
+# Outputs armored keyring with all expired keys dropped and all keys without
+# a signature from the L2 developer key dropped.
+#
+# Usage: python keyring-mangler.py <gentoo-auth.asc> <active-devs.gpg> <output for armored keys.asc>
+from xml.dom import ValidationErr
+
+import gnupg
+import os
+import sys
+
+AUTHORITY_KEYS = [
+    # Gentoo Authority Key L1
+    "ABD00913019D6354BA1D9A132839FE0D796198B1",
+    # Gentoo Authority Key L2 for Services
+    "18F703D702B1B9591373148C55D3238EC050396E",
+    # Gentoo Authority Key L2 for Developers
+    "2C13823B8237310FA213034930D132FF0FF50EEB",
+]
+
+L2_DEVELOPER_KEY = "30D132FF0FF50EEB"
+
+# logging.basicConfig(level=os.environ.get("LOGLEVEL", "DEBUG"))
+
+gentoo_auth = sys.argv[1]
+active_devs = sys.argv[2]
+armored_output = sys.argv[3]
+
+gpg = gnupg.GPG(verbose=False, gnupghome=os.environ["GNUPGHOME"])
+gpg.encoding = "utf-8"
+
+with open(gentoo_auth, "r", encoding="utf8") as keyring:
+    keys = keyring.read()
+    gpg.import_keys(keys)
+
+gpg.trust_keys([AUTHORITY_KEYS[0]], "TRUST_ULTIMATE")
+
+with open(active_devs, "r", encoding="utf8") as keyring:
+    keys = keyring.read()
+    gpg.import_keys(keys)
+
+# print(keys)
+# print(gpg.list_keys)
+
+good_keys = []
+
+for key in gpg.list_keys(sigs=True):
+    print(f"Checking key={key['keyid']}, uids={key['uids']}")
+
+    # pprint.pprint(key)
+
+    if key["fingerprint"] in AUTHORITY_KEYS:
+        # Just add this in.
+        good_keys.append(key["fingerprint"])
+        continue
+
+    # https://security.stackexchange.com/questions/41208/what-is-the-exact-meaning-of-this-gpg-output-regarding-trust
+    if key["trust"] == "e":
+        # If it's expired, drop the key, as we can't easily then
+        # verify it because of gpg limitations.
+        print(
+            f"Dropping expired {key['keyid']=}, {key['uids']=} (because this prevents validation)"
+        )
+        continue
+
+    if key["trust"] == "-":
+        print(f"Dropping {key['keyid']=}, {key['uids']=} because no trust calculated")
+        continue
+
+    if key["trust"] != "f":
+        print(
+            f"Dropping {key['keyid']=}, {key['uids']=} because not calculated as fully trusted"
+        )
+        continue
+
+    # As a sanity check, make sure each key has a signature from
+    # the L2 developer signing key.
+    got_l2_signature = any(sig[0] == "30D132FF0FF50EEB" for sig in key["sigs"])
+    if not got_l2_signature:
+        raise ValidationErr(f"{key['uids']=} lacks a signature from L2 key!")
+
+    good_keys.append(key["fingerprint"])
+
+with open(armored_output, "w", encoding="utf8") as keyring:
+    keyring.write(gpg.export_keys(good_keys))
diff --git a/sec-keys/openpgp-keys-gentoo-developers/metadata.xml b/sec-keys/openpgp-keys-gentoo-developers/metadata.xml
new file mode 100644
index 000000000000..7efb31b9e7f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220711.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220711.ebuild
new file mode 100644
index 000000000000..4ff65eaaea85
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220711.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg"
+	PROPERTIES="live"
+else
+	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+	sec-keys/openpgp-keys-gentoo-auth
+	test? (
+		app-crypt/gnupg
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	export GNUPGHOME="${T}"/.gnupg
+
+	local mygpgargs=(
+		--no-autostart
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	# Convert the binary keyring into an armored one so we can process it
+	edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg
+	edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc
+
+	# Now strip out the keys which are expired and/or missing a signature
+	# from our L2 developer authority key
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${WORKDIR}"/gentoo-developers.asc \
+			"${WORKDIR}"/gentoo-developers-sanitised.asc
+}
+
+src_test() {
+	export GNUPGHOME="${T}"/tests/.gnupg
+
+	local mygpgargs=(
+		# We don't have --no-autostart here because we need
+		# to let it spawn an agent for the key generation.
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	# Check each of the keys to verify they're trusted by
+	# the L2 developer key.
+	mkdir -p "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+	cd "${T}"/tests || die
+
+	# First, grab the L1 key, and mark it as ultimately trusted.
+	edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+	edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+	# Generate a temporary key which isn't signed by anything to check
+	# whether we're detecting unexpected keys.
+	#
+	# The test is whether this appears in the sanitised keyring we
+	# produce in src_compile (it should not be in there).
+	#
+	# https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+	edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+		%echo Generating temporary key for testing...
+
+		%no-protection
+		%transient-key
+		%pubring ${P}-ebuild-test-key.asc
+
+		Key-Type: 1
+		Key-Length: 2048
+		Subkey-Type: 1
+		Subkey-Length: 2048
+		Name-Real: Larry The Cow
+		Name-Email: larry@example.com
+		Expire-Date: 0
+		Handle: ${P}-ebuild-test-key
+
+		%commit
+		%echo Temporary key generated!
+	EOF
+
+	# Import the new injected key that shouldn't be signed by anything into a temporary testing keyring
+	edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+	# Sign a tiny file with the to-be-injected key for testing rejection below
+	echo "Hello world!" > "${T}"/tests/signme || die
+	edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die
+
+	edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc
+
+	# keyring-mangler.py should now produce a keyring *without* it
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${T}"/tests/tainted-keyring.asc \
+			"${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log
+	assert "Key mangling in tests failed?"
+
+	# Check the log to verify the injected key got detected
+	grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!"
+
+	# gnupg doesn't have an easy way for us to actually just.. ask
+	# if a key is known via WoT. So, sign a file using the key
+	# we just made, and then try to gpg --verify it, and check exit code.
+	#
+	# Let's now double check by seeing if a file signed by the injected key
+	# is rejected.
+	if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then
+		die "'gpg --verify' using injected test key succeeded! This shouldn't happen!"
+	fi
+
+	# Bonus lame sanity check
+	edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log
+	assert "trustdb call failed!"
+
+	check_trust_levels() {
+		local mode=${1}
+
+		while IFS= read -r line; do
+			# gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 0q, 0n, 0m, 0f, 1u
+			# gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 2f, 0u
+			if [[ ${line} == *depth* ]] ; then
+				depth=$(echo ${line} | grep -Po "depth: [0-9]")
+				trust=$(echo ${line} | grep -Po "trust:.*")
+
+				trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-")
+				[[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+				trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q")
+				[[ ${trust_insufficient} == 0 ]] || ${mode}
+
+				trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+				[[ ${trust_never} == 0 ]] || ${mode}
+
+				trust_marginal=$(echo ${trust} | grep -Po "[0-9]m")
+				[[ ${trust_marginal} == 0 ]] || ${mode}
+
+				trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+				[[ ${trust_full} != 0 ]] || ${mode}
+
+				trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u")
+				[[ ${trust_ultimate} == 1 ]] || ${mode}
+
+				echo "${trust_uncalculated}, ${trust_insufficient}"
+			fi
+		done < "${T}"/tests/trustdb.log
+	}
+
+	# First, check with the bad key still in the test keyring.
+	# This is supposed to fail, so we want it to return 1
+	check_trust_levels "return 1" && die "Trustdb passed when it should have failed!"
+
+	# Now check without the bad key in the test keyring.
+	# This one should pass.
+	#
+	# Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+	keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \
+		| grep "^fpr" \
+		| sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+	for key in ${keys[@]} ; do
+		nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key}
+	done
+
+	edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>"
+	check_trust_levels "return 0" || die "Trustdb failed when it should have passed!"
+
+	gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins gentoo-developers-sanitised.asc gentoo-developers.asc
+
+	# TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth?
+}
diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild
new file mode 100644
index 000000000000..e1500e00b9e0
--- /dev/null
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo python-any-r1
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg"
+	PROPERTIES="live"
+else
+	SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]')
+	sec-keys/openpgp-keys-gentoo-auth
+	test? (
+		app-crypt/gnupg
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	export GNUPGHOME="${T}"/.gnupg
+
+	local mygpgargs=(
+		--no-autostart
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	mkdir "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+
+	# Convert the binary keyring into an armored one so we can process it
+	edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg
+	edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc
+
+	# Now strip out the keys which are expired and/or missing a signature
+	# from our L2 developer authority key
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${WORKDIR}"/gentoo-developers.asc \
+			"${WORKDIR}"/gentoo-developers-sanitised.asc
+}
+
+src_test() {
+	export GNUPGHOME="${T}"/tests/.gnupg
+
+	local mygpgargs=(
+		# We don't have --no-autostart here because we need
+		# to let it spawn an agent for the key generation.
+		--no-default-keyring
+		--homedir "${GNUPGHOME}"
+	)
+
+	# From verify-sig.eclass:
+	# "GPG upstream knows better than to follow the spec, so we can't
+	# override this directory.  However, there is a clean fallback
+	# to GNUPGHOME."
+	addpredict /run/user
+
+	# Check each of the keys to verify they're trusted by
+	# the L2 developer key.
+	mkdir -p "${GNUPGHOME}" || die
+	chmod 700 "${GNUPGHOME}" || die
+	cd "${T}"/tests || die
+
+	# First, grab the L1 key, and mark it as ultimately trusted.
+	edo gpg "${mygpgargs[@]}" --import "${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc
+	edo gpg "${mygpgargs[@]}" --import-ownertrust "${BROOT}"/usr/share/openpgp-keys/gentoo-auth-ownertrust.txt
+
+	# Generate a temporary key which isn't signed by anything to check
+	# whether we're detecting unexpected keys.
+	#
+	# The test is whether this appears in the sanitised keyring we
+	# produce in src_compile (it should not be in there).
+	#
+	# https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+	edo gpg "${mygpgargs[@]}" --batch --gen-key <<-EOF
+		%echo Generating temporary key for testing...
+
+		%no-protection
+		%transient-key
+		%pubring ${P}-ebuild-test-key.asc
+
+		Key-Type: 1
+		Key-Length: 2048
+		Subkey-Type: 1
+		Subkey-Length: 2048
+		Name-Real: Larry The Cow
+		Name-Email: larry@example.com
+		Expire-Date: 0
+		Handle: ${P}-ebuild-test-key
+
+		%commit
+		%echo Temporary key generated!
+	EOF
+
+	# Import the new injected key that shouldn't be signed by anything into a temporary testing keyring
+	edo gpg "${mygpgargs[@]}" --import "${T}"/tests/${P}-ebuild-test-key.asc
+
+	# Sign a tiny file with the to-be-injected key for testing rejection below
+	echo "Hello world!" > "${T}"/tests/signme || die
+	edo gpg "${mygpgargs[@]}" -u "Larry The Cow <larry@example.com>" --sign "${T}"/tests/signme || die
+
+	edo gpg "${mygpgargs[@]}" --export --armor > "${T}"/tests/tainted-keyring.asc
+
+	# keyring-mangler.py should now produce a keyring *without* it
+	edo "${EPYTHON}" "${FILESDIR}"/keyring-mangler.py \
+			"${BROOT}"/usr/share/openpgp-keys/gentoo-auth.asc \
+			"${T}"/tests/tainted-keyring.asc \
+			"${T}"/tests/gentoo-developers-sanitised.asc | tee "${T}"/tests/keyring-mangler.log
+	assert "Key mangling in tests failed?"
+
+	# Check the log to verify the injected key got detected
+	grep -q "Dropping key.*Larry The Cow" "${T}"/tests/keyring-mangler.log || die "Did not remove injected key from test keyring!"
+
+	# gnupg doesn't have an easy way for us to actually just.. ask
+	# if a key is known via WoT. So, sign a file using the key
+	# we just made, and then try to gpg --verify it, and check exit code.
+	#
+	# Let's now double check by seeing if a file signed by the injected key
+	# is rejected.
+	if gpg "${mygpgargs[@]}" --keyring "${T}"/tests/gentoo-developers-sanitised.asc --verify "${T}"/tests/signme.gpg ; then
+		die "'gpg --verify' using injected test key succeeded! This shouldn't happen!"
+	fi
+
+	# Bonus lame sanity check
+	edo gpg "${mygpgargs[@]}" --check-trustdb 2>&1 | tee "${T}"/tests/trustdb.log
+	assert "trustdb call failed!"
+
+	check_trust_levels() {
+		local mode=${1}
+
+		while IFS= read -r line; do
+			# gpg: depth: 0  valid:   1  signed:   2  trust: 0-, 0q, 0n, 0m, 0f, 1u
+			# gpg: depth: 1  valid:   2  signed:   0  trust: 0-, 0q, 0n, 0m, 2f, 0u
+			if [[ ${line} == *depth* ]] ; then
+				depth=$(echo ${line} | grep -Po "depth: [0-9]")
+				trust=$(echo ${line} | grep -Po "trust:.*")
+
+				trust_uncalculated=$(echo ${trust} | grep -Po "[0-9]-")
+				[[ ${trust_uncalculated} == 0 ]] || ${mode}
+
+				trust_insufficient=$(echo ${trust} | grep -Po "[0-9]q")
+				[[ ${trust_insufficient} == 0 ]] || ${mode}
+
+				trust_never=$(echo ${trust} | grep -Po "[0-9]n")
+				[[ ${trust_never} == 0 ]] || ${mode}
+
+				trust_marginal=$(echo ${trust} | grep -Po "[0-9]m")
+				[[ ${trust_marginal} == 0 ]] || ${mode}
+
+				trust_full=$(echo ${trust} | grep -Po "[0-9]f")
+				[[ ${trust_full} != 0 ]] || ${mode}
+
+				trust_ultimate=$(echo ${trust} | grep -Po "[0-9]u")
+				[[ ${trust_ultimate} == 1 ]] || ${mode}
+
+				echo "${trust_uncalculated}, ${trust_insufficient}"
+			fi
+		done < "${T}"/tests/trustdb.log
+	}
+
+	# First, check with the bad key still in the test keyring.
+	# This is supposed to fail, so we want it to return 1
+	check_trust_levels "return 1" && die "Trustdb passed when it should have failed!"
+
+	# Now check without the bad key in the test keyring.
+	# This one should pass.
+	#
+	# Drop the bad key first (https://superuser.com/questions/174583/how-to-delete-gpg-secret-keys-by-force-without-fingerprint)
+	keys=$(gpg "${mygpgargs[@]}" --fingerprint --with-colons --batch "Larry The Cow <larry@example.com>" \
+		| grep "^fpr" \
+		| sed -n 's/^fpr:::::::::\([[:alnum:]]\+\):/\1/p')
+
+	for key in ${keys[@]} ; do
+		nonfatal edo gpg "${mygpgargs[@]}" --batch --yes --delete-secret-keys ${key}
+	done
+
+	edo gpg "${mygpgargs[@]}" --batch --yes --delete-keys "Larry The Cow <larry@example.com>"
+	check_trust_levels "return 0" || die "Trustdb failed when it should have passed!"
+
+	gpgconf --kill gpg-agent || die
+}
+
+src_install() {
+	insinto /usr/share/openpgp-keys
+	newins gentoo-developers-sanitised.asc gentoo-developers.asc
+
+	# TODO: install an ownertrust file like sec-keys/openpgp-keys-gentoo-auth?
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 4c0fa74270e8..a65b0caf4534 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index da01f77c8079..9fcba20711dc 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -21,6 +21,7 @@ AUX ceph-16.2.2-cflags.patch 540 BLAKE2B d7f7ce9e65d59b7a9594f4cd34091df8b496d03
 AUX ceph-16.2.2-system-zstd.patch 1501 BLAKE2B 6540822407802dacb43c4fd9c432b45ec747a77d6892f2193fe55cb09da90b035d7630bdf5f9ec6f49df5e351c1d38c96cd14e9ed180bee897f11413ba53ed64 SHA512 5e21e29b30ee67411e3631fa65d0dc8a7b232e582c995049b4e89ea709e87a42edbf5cd4bbe535e62aebb7c9509a85b92c62e0f9914b2d4ee197994e2665139a
 AUX ceph-16.2.7-string-includes.patch 670 BLAKE2B 308a1434afc6c81def5b7ef43cfb6f1bd37b5b46c5a2591c0615b941cf80cb4814c090edb6805545c333355b4dcf55991bd2459572cd16e6b2d393f1fffe2c00 SHA512 c6e0d35aa2f6a8cb4c63b7cd7baa4909e0becd0ff09f7bb712fa53c62e3f5a26c0352066c1f4fe5186a69faccc8d902bf83fea7f2df0f5324d98cc90e546d627
 AUX ceph-16.2.8-no-virtualenvs.patch 3650 BLAKE2B 3c350e1ff171ec40443bcb2e8b844192bf07d8cc84181b9c20b11bfd8785e7bbf029ee9a6abc1d52655618417769b7f32d3e758cc9456f38e7ea918499bd9ab5 SHA512 f82210448617f448205b8a51fc286fc88c149ec65eb23b4ea439e5e69ad07d30d9fb254e2ffac13b2d18c7be8a0d69110c089ff22a301ee0fe92357fcfde9c25
+AUX ceph-16.2.9-python310.patch 446 BLAKE2B 8aa2d8081083b3cc118363bc4fe16dd232d019ff6673370d400f15ed90177089eea54f16c102b6bbd83cde4773622f01b76e00f3b287f5e9f9fc06ffd1054542 SHA512 397732bbe52b5e55d08045ccdacdb2c455f8cc935dac9da269a3559e7a479453f6346e229571a7b7186f5d1f197d525bb5492c922d72b11eca8850839c09946a
 AUX ceph-17.2.0-cyclic-deps.patch 2202 BLAKE2B 14bfdada20b4d1a27308c42c4cadfe11060ccb6f8e2d84a744bd94b08f03fc810f53f2d7fdfdbd646c5d3c649ac7b64a32517d05169bd157ed0725c0fa722b43 SHA512 e1ef790fc62f03b2edb8a069b50848923f0b01b64777f0641cc76dfd7129a42b2d5eb5d778cd6e730e917ad90a325a6f51e4b1e3534a9231bfffefe488167e1d
 AUX ceph-17.2.0-deprecated-boost.patch 2451 BLAKE2B 8fcf2f55a80840ef2452c45ea964aa375f1972dc441dcd5cdf4bcda9c4b69e179d98bfe0959be40994263823e715d0c8b1631e30cdb2d75144400543b07a3281 SHA512 505bb4e50ccc9d8fc7f1540950eaf59984204966b3faa60301034b80ee8f85ca1f45998ae99a8b960a288feac32bfd780e87db94839379c6b6343fc081a515ef
 AUX ceph-17.2.0-findre2.patch 709 BLAKE2B b7b044e71206ada569fd64242256c85932ca3dc34d5be4520ce0d420838045ca26c5a7c8212762af217adf245b18197c1aa4f0bf69e8d80c3c330b0d40bccbb4 SHA512 990d70f656bb8a3a9904c7235a48622e0a2bbdf3b751b4bd8603b2078d549a7b6dcbdf204a88512c525c2a95dbaa0ac792aafa5cf565faf91a4417923e7ae57b
@@ -31,6 +32,7 @@ AUX ceph-17.2.0-osd_class_dir.patch 486 BLAKE2B 7d9e144ab40e5e2f73a1412a65b27ffd
 AUX ceph-17.2.0-pybind-boost-1.74.patch 845 BLAKE2B b862b1abf61c0f5cc17964c86073a083b217f01ca5ae725bfe07ba13702e2d835bf8ccc4b5fae4b3138230b36722f4de0c8176811d6eefc1523e1fcb4848b744 SHA512 525b5df44f0de71ab0b2024c8bc0ccf98740a0befac4b032ae9a0fb6e2a05926d7171ae4b0af4ba32e71c9e04fe90aa192a2e3ae433242a62fa4e4efdc855321
 AUX ceph-17.2.0-system-opentelemetry.patch 705 BLAKE2B 0036ad8e7d2d8a707db5ea137cb47e9cb18d8e4d8923d3c8dc1306adca24fb30c029e03d76a281219ce34928b5ed6448aba4a98b2286a942eda2cf86fb0e5365 SHA512 d845ae2b9d31604d622dfb2993186ca1b3e37d3a5e88df8b4747c45b0f1913f4e092a5b0a2405ab228a57e6717bdf51c5458c66eab601eabdece4524085840e3
 AUX ceph-17.2.1-no-virtualenvs.patch 2780 BLAKE2B c1a752893800344a89321c76763268453de3fb275a7e952bdd81c6356d3e5aec48fb8623025c5d4fb7b0281b7d31272c145ef7d921c42c41d858f46105301eec SHA512 53bb81846633e6ff480d46c777b46bf6af2dd07817c84413c772836d7815e5a38c7b61c903af32434896041617175afaaeea6f5618ef5fbec0ad9afd7d7aa8f6
+AUX ceph-17.2.1-python310.patch 1230 BLAKE2B c4a0b66aad00ac1ada6abe3c135c503f97dfbb203633ee0f753d0370bcb8f048c42ff91ccaf6bcde41fb3db6ff0346ff8e99735426c0a65c2dc6effee4019f4d SHA512 f49427d3420574043e18cad517a6f81ee38a48b827195f564fd728fd2f2b32dbf17f9e21842b01bbf3ab40875c70b0db316a478b8cc48dd92c839d2ce5e7fd63
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300
@@ -50,6 +52,6 @@ DIST ceph-16.2.9.tar.gz 157168096 BLAKE2B 0a667a9699925cfc920ca0cc535e5331cbcd95
 DIST ceph-17.2.1.tar.gz 168819036 BLAKE2B 2d6506f3a43ccbe4a149163c13ab2de72aeba568308ca7c0c59d0ff32316519d27b334451fd8d78af799cabe3b5a8c5b7b19d5da028e52c420ec7fc38efe5aad SHA512 cb88a3feff67ce41c575cb6c0067a32de51fcbf36d8f9f7273cccd54a3413ee890f473e83fcc1429a86b858b05c412fca8b2cfc24871c5adf612e3d224227cf0
 DIST ceph-xsimd-17.2.1.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 EBUILD ceph-15.2.16.ebuild 10917 BLAKE2B c1b135b0cbdb9f390248ec861e9c196095cec4011f934fa859c39475483d815c6f369bf88e7d8ca21690f500e372d9707ae00084d3dcbdffc72e7e928c55a07e SHA512 281d6915a55ebe16619549f9bdee35ff4af0ffc68ef1360ec2c132a03a57d4361e7216f9b663486ebd77512aa563bdeb70d30e3feb8cd8e1c3a21c7a21277a43
-EBUILD ceph-16.2.9.ebuild 12557 BLAKE2B dbdbfd4664e51b2e86f8034aac15fa46601c0d557bc20e5218b93aef23df80eff2a0b493252f9a3610cec41c7867c0ac91fcc9e7dcb0d38e3a7dbafeb9e18c80 SHA512 7b9f961015974b443b1f85603acb4088928068636d213d3e5cf25ff0341446be0f3806154a4697c2eef6920802cded2bbad5ab93d02d31e1c6bea4f6d38bf343
-EBUILD ceph-17.2.1.ebuild 12384 BLAKE2B fa5768b7dcfb46797065335cf87bfe9e4f553a404bbdf58bf0695b968c54d7f11435c9db1005eaa75ba614512c453f82349010c0bb87185254eefcfb6c962a08 SHA512 2c6ab3c69d8d08a77ff5a71e577d4c9f4cd642bed041fca1528f360ba21104e2e4426caa02ecaccc9ce64b5e997245e731bd64ec52372ee5d9b130f73d92caf5
+EBUILD ceph-16.2.9-r1.ebuild 12603 BLAKE2B bed9f1ffc126209a8ffdb7186eeabfed222e19c6db4ffc2189e4c65338accfb3c86d3134b0adc9350ef186ee0897092b5ffffa4140b785f6dee6de17ab07a91e SHA512 b5efc7e701b0784c4f4299ffabc01ff7a3ddc73ca16f36d1fd16e7e2562d78f89e11b960f9eacec697d9e788841d73e73d17554a7a916ab09cbe1a7cfc20557f
+EBUILD ceph-17.2.1-r1.ebuild 12449 BLAKE2B 73eac41797937b4a255ea299a17b5adcc6d1afdcdfa9a283ad9cc7bf87b65fe503f4dd17595774979d0ff1652bb739493fbc6ebdad8caa07714e4f6665f53632 SHA512 792d0c808cff8b4c1b329a190a44a830b48504387772df0c994380304d1d39fafe479d5181a5168972672ce930725f48b52a5f51803a0b6b495d5b7800184d2f
 MISC metadata.xml 2453 BLAKE2B 988cbe4fa5176fde46a503932a58555554e577a311180df706021ea67a8c861b82fbc476cc757c090ea4e753b519212a2cca8c0605921c4e121b770fd1cc61ea SHA512 14c25df4749cd86f82782f8e7cda587a0310e4cf28b6d4f8ac1fa4abee532d6d553f35fcfb8ab0393ce876d36a8fe2851408ad5eaaf5cf28834f03cf744ac6c1
diff --git a/sys-cluster/ceph/ceph-16.2.9.ebuild b/sys-cluster/ceph/ceph-16.2.9-r1.ebuild
index 688c98bb2b8f..880937c7a706 100644
--- a/sys-cluster/ceph/ceph-16.2.9.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.9-r1.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 	dev-cpp/gflags:=
 	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
-	dev-libs/libfmt:=
+	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	dev-libs/libevent:=
@@ -217,6 +217,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-16.2.2-system-zstd.patch"
 	"${FILESDIR}/ceph-16.2.7-string-includes.patch"
 	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
+	"${FILESDIR}/ceph-16.2.9-python310.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-17.2.1.ebuild b/sys-cluster/ceph/ceph-17.2.1-r1.ebuild
index 4b5281e5f669..8a67048c3455 100644
--- a/sys-cluster/ceph/ceph-17.2.1.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.1-r1.ebuild
@@ -50,6 +50,7 @@ DEPEND="
 	<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
 	dev-libs/libaio:=
 	>=dev-libs/libfmt-6.2.1:=
+	<dev-libs/libfmt-9:=
 	dev-libs/libnl:3=
 	dev-libs/libxml2:=
 	dev-libs/libevent:=
@@ -214,6 +215,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.0-system-opentelemetry.patch"
 	"${FILESDIR}/ceph-17.2.0-fuse3.patch"
 	"${FILESDIR}/ceph-17.2.0-osd_class_dir.patch"
+	"${FILESDIR}/ceph-17.2.1-python310.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-16.2.9-python310.patch b/sys-cluster/ceph/files/ceph-16.2.9-python310.patch
new file mode 100644
index 000000000000..403cfe2f3d1d
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-16.2.9-python310.patch
@@ -0,0 +1,12 @@
+diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
+index 38aad299ccb..8e152e060ea 100644
+--- a/src/mgr/CMakeLists.txt
++++ b/src/mgr/CMakeLists.txt
+@@ -34,6 +34,7 @@ if(WITH_MGR)
+     mgr_commands.cc
+     $<TARGET_OBJECTS:mgr_cap_obj>)
+   add_executable(ceph-mgr ${mgr_srcs})
++  target_compile_definitions(ceph-mgr PRIVATE PY_SSIZE_T_CLEAN)
+   target_link_libraries(ceph-mgr
+     osdc client heap_profiler
+     global-static ceph-common
diff --git a/sys-cluster/ceph/files/ceph-17.2.1-python310.patch b/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
new file mode 100644
index 000000000000..767cd2922a26
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.1-python310.patch
@@ -0,0 +1,35 @@
+From 389054888f2aa782f73564125ec7a1ef0212d536 Mon Sep 17 00:00:00 2001
+From: Pete Zaitcev <zaitcev@redhat.com>
+Date: Tue, 14 Dec 2021 23:04:34 -0600
+Subject: [PATCH] mgr: Define PY_SSIZE_T_CLEAN ahead of every Python.h
+
+Building on Fedora 35 with Python 3.10 makes vstart to loop
+forever, throwing the following message:
+
+ Error EINVAL: SystemError: PY_SSIZE_T_CLEAN macro must be
+ defined for '#' formats
+
+I followed the hint in the following document:
+ https://docs.python.org/3/c-api/intro.html
+
+It says "recommended" to always define PY_SSIZE_T_CLEAN,
+but as you can see it is actually required in our case.
+
+Fixes: https://tracker.ceph.com/issues/53441
+Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
+---
+ src/mgr/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
+index 55147af4fc6ba..8f39e41ac0694 100644
+--- a/src/mgr/CMakeLists.txt
++++ b/src/mgr/CMakeLists.txt
+@@ -33,6 +33,7 @@ if(WITH_MGR)
+     mgr_commands.cc
+     $<TARGET_OBJECTS:mgr_cap_obj>)
+   add_executable(ceph-mgr ${mgr_srcs})
++  target_compile_definitions(ceph-mgr PRIVATE PY_SSIZE_T_CLEAN)
+   if(WITH_LIBCEPHSQLITE)
+     target_link_libraries(ceph-mgr cephsqlite SQLite3::SQLite3)
+   endif()
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index fd9cd7c72b67..85372efd575d 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 76259bf56dc7..efd1ff147f0c 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-6.0.tar.gz 21166276 BLAKE2B 37a4033d7d6096e029850ea7d061aba387d7100599833924a86281fa87bd31b640f3a1d20f55da8b67deecf211aa99a6cb90c3ec5602042e93a0bd55ccf0d7d3 SHA512 5449129b21cb3c5093c73b7f712e91c05db27f60d3797b0697c3dd2929b6996b2ebf41a0e827b72a110625654acd2e336a73f76fba144d30e56586ac3ba2ca34
-EBUILD wordpress-6.0.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
+DIST wordpress-6.0.1.tar.gz 21171263 BLAKE2B 674ccdc9c035d79dd1c58906480b7aca044b268a2f8b80a57f0a6d5500750c71e1377625a38a63daa2cb84623f23d93d998bb75996174ab3b2d86c765e459a22 SHA512 686d03212cd635e343e2d2d468aabb9c4499f87a1db123943ef65547dfbd826c233777a3b7cb53e3838d08f51f3d4cdfeee53f49ad7408921d52315aad65187a
+EBUILD wordpress-6.0.1.ebuild 1368 BLAKE2B 68aa2c644a238675b3b6b7c1f04cfa44afd113e71f52b925543923c73dc0671bed50c7e1580fa75c7a677ac709e173f0ea265c47f5dc9e9af08e65aed8cf30ca SHA512 28abf3d321a795c5cc9f6ce51eb7f3b8571c9890f7c04ed062263d022188d8c8cf4a808b2c398aaf1bcf67746e9046f41da701a8ef23e5550cdce2811782a81d
 MISC metadata.xml 429 BLAKE2B ece54e1ebae950843d98b414ca862ebcbf410230587eab84031e4afa00a9e6f0305b025a79fd5f8ce3cb70b2528adb8c5eee05e6855f0b2f55aa4680fd9a4b83 SHA512 acc7151db82ee83a7ad9b6eff62918afdc44436cd18aa4f5fe0b562257ed34ac7ca28582cfb5196b1049cb9e0db0a94c51faa8cd7c3bb081a5a0a2333391388c
diff --git a/www-apps/wordpress/wordpress-6.0.ebuild b/www-apps/wordpress/wordpress-6.0.1.ebuild
index 6ea3e4bf16ad..6ea3e4bf16ad 100644
--- a/www-apps/wordpress/wordpress-6.0.ebuild
+++ b/www-apps/wordpress/wordpress-6.0.1.ebuild
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 22a47a57f493..7c5aee31dd08 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index 5ad802edca70..b26ce5e00f74 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,3 +1,5 @@
 DIST xev-1.2.4.tar.bz2 136792 BLAKE2B 46b38d7295f8a11509598758ece9d880f9c3d303064de5cb6ef12aa9d0b066e78aefd3aa5e0c94ea4af7633936209474be362f9e38c0994eefe798662c2e4c6c SHA512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca
+DIST xev-1.2.5.tar.xz 128848 BLAKE2B 468e8b21ffba9473bf04160f053a4300df61280083cdad0d94f2d309abeab96611031cb6d054ab011c4b18c01f63d2e5cd0ab24c5c42ba3e337999716e57851b SHA512 9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a
 EBUILD xev-1.2.4.ebuild 387 BLAKE2B 3a2a6e9b12c54a896403d34e070597110fc36ee6507ac28418ec7a10e0697f44dd33aceba1cb53e29d68813d5e53db7f2397aa5ada63f9ac41984ab984ef82f8 SHA512 9a20b20bae3fd657bf7ea16152a09fc37b547346706aaa2bda9fbb2d5e785ba18e15766cdd1ba0194624d4b4ea21e162a0f36cec166f9763e1450b60e99fcdaa
+EBUILD xev-1.2.5.ebuild 413 BLAKE2B 9d315beae91fad236e8c68140229dd9eb12c2e503d336c5558e84e789fb34ed3269473629b420ce0bd3cfb77f35ee36725fa80d24fcaa588256de2b2904ca771 SHA512 ce3a00e8052a2f3a422656e7256dfe8f0079886dd9ef3c3f05bd782f972522aab388bbe824724c2508c391b825ea2d27f346d5a7fc3b0fecd0c8150eab5e08e4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xev/xev-1.2.5.ebuild b/x11-apps/xev/xev-1.2.5.ebuild
new file mode 100644
index 000000000000..f810e16b46bd
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="Print contents of X events"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-winnt"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index fd2416987092..5918d8dbef5e 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,3 +1,5 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
+DIST xkbutils-1.0.5.tar.xz 129344 BLAKE2B ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53 SHA512 0d8d460f5e015e9034292688437511068dab61216c2493f2981cfb63aaa012976ac9435c1586a22c0940fbfcb779b48dce9b85832303fe2b854aa945b814ac77
 EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 91ad87fa648ae3520b0a140b7c9cdc29ae09f78e06deb88d4a3f261d146824c2016316e528f91386f2b0149f388707536f439684a6cbea1d05137fd3880e2b5c SHA512 795a2f878e3795267bd150bdbdb8a27dac5b169e1c2103250eff0f94cde0b5e6142b0a5fb81963e2b6f50f36c42187bad9c406947ddb2748cfde7831d417cf13
+EBUILD xkbutils-1.0.5.ebuild 391 BLAKE2B 7990d42365200c7b5d53e93876117c897b1e91de16462a763108637f790c1abd496968b4874a521255412df19bc49118a10dac73468c620cb063dcba42d402cf SHA512 02f8f641df4070e0c38127ad3bf69903be6c88dffbf168442138b9765a5c84d09feadc6883404675d4a463a75b109d659f916a02784c86eab498a86ec6072721
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xkbutils/xkbutils-1.0.5.ebuild b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
new file mode 100644
index 000000000000..b8f8e582f850
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-1.0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xkbutils application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index e8b4af4fd0c4..6444c25ae66d 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,3 +1,5 @@
 DIST xmag-1.0.6.tar.bz2 143112 BLAKE2B f53d7f564c71100e5903c19ee86aae3405cbc56258c89a5ad3d5e583649e1c2a862fef875c6de18c462e103da2afcd4fcfc9927188e7a4e8b980c7d80b2c4c64 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de
+DIST xmag-1.0.7.tar.xz 137660 BLAKE2B aa809a5e36d5e05524ab78d2382e15b2294439927ee7b441d246134120cef360fc2eb32b0611874a4bc4b45613a8e0fcc0e6cd595fea3fbd5a919aba593d90d9 SHA512 d35ac5d977b9f3bd03fb919bf178f68bdbc6ef2a57915b407d836fce0582f5cb78d0b79043bb6f8d015464ca113deb09469c3b724aed03901a4c3fc4a9982984
 EBUILD xmag-1.0.6.ebuild 325 BLAKE2B cd8d45f91f7bf0bdb71d1e271706a0108c8792450975cf54c30b577624000c83a7e55e18089106bc2169cd1c79b30ff6e8cd21e14ab56a418aefac8d09a00981 SHA512 fecd2fcc9d1aa206ef66f34fd3b244ca2d10089f5c195446dd408f7b329078d681ef48ebc8717561dd0faadfd32ec1681ba40ec160dd0bf74ee0eba7b9436916
+EBUILD xmag-1.0.7.ebuild 377 BLAKE2B d644ba1fd5190d85d966ee9f7cff1ea9b1465eedb63417ab962b1d3b8c64bcf0b3164b9b916a34c6397c6af828e27a7aa5fc7d073315cc50b4bf628c1ced90a0 SHA512 81e1594d191a1f782ce104a9d0678e754a549ec181236aaa699b681a2bb30000a0c8fa190c560786fba679d74d93001dea2b2d0e2ea7266512db1d1caf391ade
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmag/xmag-1.0.7.ebuild b/x11-apps/xmag/xmag-1.0.7.ebuild
new file mode 100644
index 000000000000..9e5c389509ca
--- /dev/null
+++ b/x11-apps/xmag/xmag-1.0.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="X.Org xmag application"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 11888aa9889c..64c69d05c9b1 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,3 +1,5 @@
 DIST xmessage-1.0.5.tar.bz2 133393 BLAKE2B afa42e20ba995fa1086cd3cee5b90be8564c521f7bc12b544a787cc753782e1cfdbc5a94f5925f5bae1b630b7ac08fcaeee59e319f680d3be29c46d5421aa048 SHA512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe
+DIST xmessage-1.0.6.tar.xz 126324 BLAKE2B f818af4d7a17c2da6e00fbc00622606153b74bccb809ccc42226a0be3d6f19840c3a20278fe2d73f4af1e624b37a4c086c81650ab9262a1692e6d3ab5d5b1764 SHA512 89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8
 EBUILD xmessage-1.0.5-r1.ebuild 468 BLAKE2B 1852aa88e19d0042a7362de224baf8ad1d1c24525d1eb8bf1e490e9d79621c7ffa677b542a89ea90102e93427910da547bbd4d9c2269b9791b790a34dc32804a SHA512 5b05840df386b9b1ebdd5c2c69336cc2f14159d7bcf3de0722f14f5b64c3e296cc21f4c08783187ec265915b21801971010b7c2df5d5b6d1e51453f3e46c181c
+EBUILD xmessage-1.0.6.ebuild 523 BLAKE2B 779947e75b346a16ce85a21aff5ead5dbe37c4719a12a55f25377289196a2d080e5e9b5f4762e06037b4a82fcecdbf3deec3d77d453f758d1be87ab6a80b79e0 SHA512 238cb1a6a06744d04ddbd1fa9837dd8e154c779c566b3caaf1aaa39b8b9df720b95b95595f8c2890f9c9ba365bf395b9dc0261fd1a82cce15bf3c786c4094881
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xmessage/xmessage-1.0.6.ebuild b/x11-apps/xmessage/xmessage-1.0.6.ebuild
new file mode 100644
index 000000000000..624e321d264f
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index cbddd8189dc7..cce5e428ec07 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,3 +1,5 @@
 DIST xrefresh-1.0.6.tar.bz2 127494 BLAKE2B 587f5756bbd3095e77494288d4b9cca99992b342bb718e5cadefdfbf018710ce0f216f43b68814d0d0a681c87d855be4ecf199a314361278c3bfdd81e6073f69 SHA512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
+DIST xrefresh-1.0.7.tar.xz 121820 BLAKE2B c60ffec9e03b1d07b25228b9066b05a437160a48c182988781890f59271b835079af0dd071ce77b56768fffeb0203bb092fbf80c286272c82e56af2c867ae3e0 SHA512 8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31
 EBUILD xrefresh-1.0.6-r1.ebuild 331 BLAKE2B f7f6cbfd2a77dbb8d077e6eb8925263917ae547ff40b859623b397b125265a2d4863541fc49d0e0ac0d0a5786ee55664a3a8175508d0ed732730bb5382864ee5 SHA512 b71f02718163a96f0f68549c1010a051c619f96a6b2fae38ac607edcc4f2b4b7cbc232bdb07324cd04ace972040438e65dd824d08f3785199b649f3450420721
+EBUILD xrefresh-1.0.7.ebuild 363 BLAKE2B 199c0aeb15cabe0036a15f0e1084223a60aa004d7f4138da6c81ada93d4b6e479b5e116705c38bcb9d86bd6be53cd8703d2ea69882027af3662341574e9dc071 SHA512 4ad26a5824d67373c0d871d8344e15d31fdf000b6a4fb1ae112e30736b1f069f007166754d50d47bdb8ce93519cb29570908a6cfe15eee71d07c877e278d8c29
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xrefresh/xrefresh-1.0.7.ebuild b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
new file mode 100644
index 000000000000..58d4971c8e0b
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.7.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="refresh all or part of an X screen"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index b81ccdeb1d51..0e7698587133 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 0b13cc978e73..dd23371a99ee 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,8 +5,10 @@ AUX xorg-server-21.1.3-present-null-check.patch 1059 BLAKE2B 4702229922d575ed93d
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
 DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b
+DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
 EBUILD xorg-server-1.20.14-r1.ebuild 5195 BLAKE2B 845754526068efc9d3e98256ce1d9a947a1533429416acd94b6025a86d7c4de4737177b8786a3238aee42e3f10314c42a00445dcad29caad6c94253fcfb9a1e0 SHA512 9615fbd48424508cec887368ed589857f80ad2087f63887529b3fa569a781c70aa7e1fa5a7d253c3731ca25db6da2f7cd9c9f9fd65f2eff66378412731dfcdc9
 EBUILD xorg-server-21.1.3-r2.ebuild 4484 BLAKE2B 95ac43670df395fbd1c6ee31e7cc85d9b467be934e159eeab08e3b2638e16f7b4470065a6e20f4aa1829fc116882826e7252742a99c23038411dabeb097eee88 SHA512 0f180a3ec665f29436d978352846015a8046b1aca9717692aa9458ec22f9d36794b3cb98d6f29d9857f7f2d1159c2f9663a4ae8af5249b19882bd0003d9fa7cd
 EBUILD xorg-server-21.1.3-r3.ebuild 4530 BLAKE2B 8358f69ad5fd9b84d3f8d7b3cfc5f58f006c24ec5e4ebb3411202585f486665151dd405149808485998b228f7044adbb86e17c934875c31efe887fe9573c93bf SHA512 9959c03c2795c8ee83f043ecc659dc08f47245d013f433a8fa1da7b3b8c6be60268faecf8441b78ee3f810a002d222a52fe8ca095fdec79922dbdd11ba974528
-EBUILD xorg-server-9999.ebuild 4454 BLAKE2B 0ca1c606ecbc7f47cdc8d13273141ce29d80130000eb7e00b5a24a069b599f276d4ff2b4583a6206b636137977d0a38b3559d3a6ab8843908c3e2691e9c7ef0b SHA512 d4daa9b356ab4a2044cb0ea88e63eada448b2cf75882f6e6c0639b06543f804dad8d52353035caac5f12ec001f95a468f6a25416ce4e500039e1728a0e4d6f88
+EBUILD xorg-server-21.1.4.ebuild 4459 BLAKE2B 07b51df2be6cb5939c6d3b23982df5b691453fb1a4b1c9afc37cded6823371a03bb09bcede9417304edc319861414571171f1c05e5e742edf333ec858239426e SHA512 8f2363b32a015c816b8169a6db437bd5fd3550f02f62d91fce850f63f9f4a043e8094959da670ff4b8daa67099cc3632c99e35b8898b80fd5c28ed5335638659
+EBUILD xorg-server-9999.ebuild 4459 BLAKE2B 07b51df2be6cb5939c6d3b23982df5b691453fb1a4b1c9afc37cded6823371a03bb09bcede9417304edc319861414571171f1c05e5e742edf333ec858239426e SHA512 8f2363b32a015c816b8169a6db437bd5fd3550f02f62d91fce850f63f9f4a043e8094959da670ff4b8daa67099cc3632c99e35b8898b80fd5c28ed5335638659
 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637
diff --git a/x11-base/xorg-server/xorg-server-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild
new file mode 100644
index 000000000000..85fc86f9ac72
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	media-libs/libglvnd[X]
+	dev-libs/libbsd
+	dev-libs/openssl:0=
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	xorg? (
+		>=x11-libs/libxcvt-0.1.0
+	)
+	xnest? (
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libX11-1.1.5
+	)
+	xephyr? (
+		x11-libs/libxcb[xkb]
+		x11-libs/xcb-util
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+	!minimal? (
+		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+		>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	)
+	udev? ( virtual/libudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	selinux? (
+		sys-process/audit
+		sys-libs/libselinux:=
+	)
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)
+	elogind? (
+		sys-apps/dbus
+		sys-auth/elogind[pam]
+		sys-auth/pambase[elogind]
+	)
+	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+	>=x11-base/xorg-proto-2021.4.99.2
+	>=x11-libs/xtrans-1.3.5
+	media-fonts/font-util
+	test? ( >=x11-libs/libxcvt-0.1.0 )
+"
+RDEPEND="${CDEPEND}
+	!systemd? ( gui-libs/display-manager-init )
+	selinux? ( sec-policy/selinux-xserver )
+	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+"
+BDEPEND="
+	sys-devel/flex
+"
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)
+	elogind? ( udev )
+	?? ( elogind systemd )"
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}/var"
+		--sysconfdir "${EPREFIX}/etc/X11"
+		--buildtype $(usex debug debug plain)
+		-Db_ndebug=$(usex debug false true)
+		$(meson_use !minimal dri1)
+		$(meson_use !minimal dri2)
+		$(meson_use !minimal dri3)
+		$(meson_use !minimal glamor)
+		$(meson_use !minimal glx)
+		$(meson_use udev)
+		$(meson_use udev udev_kms)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use selinux xselinux)
+		$(meson_use xephyr)
+		$(meson_use xnest)
+		$(meson_use xorg)
+		$(meson_use xvfb)
+		-Ddocs=false
+		-Ddrm=true
+		-Ddtrace=false
+		-Dipv6=true
+		-Dhal=false
+		-Dlinux_acpi=false
+		-Dlinux_apm=false
+		-Dsecure-rpc=false
+		-Dsha1=libcrypto
+		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+	)
+
+	if [[ ${PV} == 9999 ]] ; then
+		# Gone in 21.1.x, but not in master.
+		emesonargs+=( -Dxwayland=false )
+	fi
+
+	if use systemd || use elogind; then
+		emesonargs+=(
+			-Dsystemd_logind=true
+			$(meson_use suid suid_wrapper)
+		)
+	else
+		emesonargs+=(
+			-Dsystemd_logind=false
+			-Dsuid_wrapper=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# The meson build system does not support install-setuid
+	if ! use systemd && ! use elogind; then
+		if use suid; then
+			chmod u+s "${ED}"/usr/bin/Xorg
+		fi
+	fi
+
+	if ! use xorg; then
+		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x || die
+	fi
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index ceb51d5bc279..85fc86f9ac72 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 XORG_TARBALL_SUFFIX="xz"
 XORG_EAUTORECONF="no"
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
@@ -31,14 +31,18 @@ CDEPEND="
 	>=x11-libs/libXau-1.0.4
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxcvt-0.1.0
 	>=x11-libs/libxkbfile-1.0.4
 	>=x11-libs/libxshmfence-1.1
 	>=x11-libs/pixman-0.27.2
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-2.4.1-r3
-	>=x11-libs/libXext-1.0.5
-	x11-libs/libXv
+	xorg? (
+		>=x11-libs/libxcvt-0.1.0
+	)
+	xnest? (
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libX11-1.1.5
+	)
 	xephyr? (
 		x11-libs/libxcb[xkb]
 		x11-libs/xcb-util
@@ -48,8 +52,6 @@ CDEPEND="
 		x11-libs/xcb-util-wm
 	)
 	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
 		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
 		>=media-libs/libepoxy-1.5.4[X,egl(+)]
 	)
@@ -74,6 +76,7 @@ DEPEND="${CDEPEND}
 	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
 	media-fonts/font-util
+	test? ( >=x11-libs/libxcvt-0.1.0 )
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )
@@ -92,9 +95,6 @@ REQUIRED_USE="!minimal? (
 	elogind? ( udev )
 	?? ( elogind systemd )"
 
-UPSTREAMED_PATCHES=(
-)
-
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 32079d886412..3c38532dbaf4 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,8 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
 DIST xwayland-22.1.2.tar.xz 1271848 BLAKE2B 2efb3111396e1ed6ae6a4489c6d8612d511daea95edf456e60136185db9a69f937f0ab838e3c3095b76f9221d3b84ec0a1a7424f849e69d26eada0b988ebb675 SHA512 c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4
+DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4
 EBUILD xwayland-22.1.2.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
-EBUILD xwayland-9999.ebuild 2221 BLAKE2B 7e7383bfa79c1aa60274d44068f63cd06f59c5e4f1c93b78660989068fbea140e2e9ed294a78466bcaa22fd43bae7c7d085f82d498180e7b8f1a08b905c204c7 SHA512 b3cfdae1ada3028a22afc4ffaf1165a8cfbaba345055afea7a4a35649c1900f9f12def59956309eb1c0f80304ce1f00b21566096743d41abd5f2032f367e070f
+EBUILD xwayland-22.1.3.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
+EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-22.1.3.ebuild b/x11-base/xwayland/xwayland-22.1.3.ebuild
new file mode 100644
index 000000000000..384312c2aa5c
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
+	inherit git-r3
+else
+	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Standalone X server running under Wayland"
+HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
+
+IUSE="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.20
+	>=dev-libs/wayland-protocols-1.22
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xkbcomp
+	!<=x11-base/xorg-server-1.20.11
+	selinux? ( sec-policy/selinux-xserver )
+"
+BDEPEND="
+	sys-devel/flex
+	dev-util/wayland-scanner
+"
+
+PATCHES=(
+	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use selinux xselinux)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}
diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild
index 50b847ca3553..beed9ee6c40c 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
author	V3n3RiX <venerix@koprulu.sector>	2022-07-13 07:36:05 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-13 07:36:05 +0100
commit	5c0c70d5917e66743293789a6d6fd7d72250eb32 (patch)
tree	f6738b2393c696bb8b19bd6ff0e52aafadf65101
parent	c5806fcd6b740ecbd62f4fb2e09d8c8dfa2966fc (diff)