gentoo auto-resync : 06:02:2023 - 09:19:42

140 files changed, 2054 insertions, 169 deletions

diff --git a/Manifest b/Manifest
index e7db29993194..f3737180e20e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29469 BLAKE2B 84dafe7da741585c1f18d7e127f743837f6a4b7d9e3e127e754ff079280cb0e3eca5c8f0f8ca6ee64c7142254512c375a4778ae0a4f7fc309715afc6d744075c SHA512 5c47c34d8dbb918dd609787a9f2d0c71771feb68df3a63ff78c8acbe60e909ffbee0dcdb116a28da3498d80b6bd4c807b49cc8e42829523ea2379c338e510529
-TIMESTAMP 2023-02-06T02:39:40Z
+MANIFEST Manifest.files.gz 29469 BLAKE2B 05555c254b5dc4b258a7af855293e0fdc8025405d47111c2c9e11bc91a20436c3c7899212cc73beac50659b88e177a7ab8fdc9345c6c1d064ed238ad502c288b SHA512 3c61bb588a379850cde92c9c9326d3c95291984526a5e80afb8a421b81e1c797e0d1b7b8326aa3341cb6b4300802581a5ff90da7112c4b2d373fced527c1a0dd
+TIMESTAMP 2023-02-06T08:39:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgaGxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgvMxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBz7BAAtE1oqLA4tU6m+9x0t0gqlQM1xV0lbKGbYGgS2fodEchK8JxT5ZpsBor5
-7qTjuc+YQfuclItreakmlEtbqVUwziCr/8pyim69cyIQXpgdI8wvdYDFXP2VRAGO
-mS40AZJNLVROlJ6CO5eHOy6AUnmt5Hs1QBx/1C3SDQ2ZgFO8ADZHw3Zt3Vn+VXl0
-Tf2YgrWDRlpPmE3zm4NvRx557Jy3tp4o686ySImaWw9Y/uczgk5eG3n+Ftgwxrz9
-ThgBJpAMjuLmGOR2e5zAmCyiuerU7xugAV+eZkYav10bIoM2JJU1xvUNxwCux3Rt
-s0/huNf0a3Nu46z6wTYiqiakHf5XZvboFvXPdwCEuQOec5G2I8r8xsUkQdykr2m4
-JgHAq7z+Hksb/O6/TVDREOVRT2QjDbmIBiXlLU5pr/u572kOpZdw8mJXq4mJ4c1n
-BlJglh7M05+tGyKwLTajVHcAA8daEDYNNXL8XOpqNO6DIsAyz0KrV4FgoEHXrCuF
-tLj4bqAMbg1VRDtfn0+5hei7+yiGXz33F45rgD2l7rsYnrCVF0quWCTSHoW9Ka1k
-Kyn1alftx+1zzEF6zzWrIJYy/e/36fGFFgPRzgbj/4dFXnTbIJwlTMEGoXMUVDIF
-6Qudtpqfvfms4VnLL6+/mAc9oWKtBvSIXvsOpBOv5U6MvU3Twv0=
-=z1+3
+klBGug//Zj/N/WvlKuTjKEfP7PUTgqEYZBXRIYoPeyIilvF1YzAj+W9JZpFPobsv
+qvn0MKgr0Ecnwn5F6+jbZCKUFOjbNk1Jv1XAuJx6F+5To8gUWbk3N4IZw7+0LaXQ
+mEM2VfqAYQz9VgC87L1D16yNgLDjLOodOSD8nZxs2ESiGoNO4D2Je7gZ2N5e8EpD
+FJj9sExl5Y4RTFrbHGxvPYHAKg42VeungF1TjaFrtJAvOXxBUjRXIEz6VYKpeoiX
+/yIyjz4LCJHqK4ZPHk19r1f47nwE+Y68M0MdbqrB2aobC+obh073NOcnDIKhvhHQ
+FpOYl1FD6OmrCcG5yXicEW+PyehMvS7RXIhz+w096fAm9aebmSLd/7LDUjQ5UTwG
+Xin4BBuOYkf31hf4irMz80yY58P8jQkvltUQf9VfTqihJrByfAdR2g4+MpkQQkGm
++xKJtVB+xalAbS+oe5iEUVRBU5SKrPwBh/7T0tCAPHRdch+h3M3Snp98YnSQlJVF
+L93nNxCC2EZPhvyngiuHRi0iZ4Mv6xCuY5DzgWXspPXJl2EimDG5YTCRxK1mi9KT
+YSjzGqpuhH27taSS9ZDT1rpbWvrwp5Ist+8iZ7HzcTY2gdjI1YQx9GCrGvQarLaV
+vnrIkTAJhEgjZB+FUGxzEpAvufEm7jJwaoqTiR9/EzriCvjKzCI=
+=i4oq
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8401b2965203..9da9eb6c869f 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b785adf997eb..896673038b17 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index d0c13ae0f269..a9661d8ea93f 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,3 +1,5 @@
 DIST gnote-43.0.tar.xz 3325232 BLAKE2B 9e56aa164262b710aab872be48fded2a6c70a062ddfe7c95ae633c38269390a6b3c3143c788f0ee43fb37d0229443a600d71e5edfbab1aa387a20e135210a0dc SHA512 34133ba1cef12c02a6518017f6b5b07b6781f05af787034ceb3dd8bc4d59fff2a7cdc17615511e7008c39bebf52e6b78a973840bdd5b6b1e5199226fdd12d91c
+DIST gnote-43.1.tar.xz 3329384 BLAKE2B 0e871797160a45d07ec17d9fbfeaaf159b755bdf373480ac47ac03b966b87510d0d721fdc581da76c0f7e3b1098964d926122f0aeb36c4a44597b137fe41ccf2 SHA512 7b007e325634371deee99e09230f4f2427a072e203d6086a91888ed3be69b54b22bfc9e49010a43a09c134f0d4de9d510fd1a370e2432f9542241d9f37e05921
 EBUILD gnote-43.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
+EBUILD gnote-43.1.ebuild 1531 BLAKE2B 2ae5ebad3e7b62b2a54ac46ccf50528a4507a6e95e64669000e228cee1a80aedb275e393a94356e1a70e8be6a4fdb029d4cedb983e06e6b81cb3555f9095967c SHA512 74864a1ebd897932609a7dd09c6cee678149166f765b77561f0977f5db5a15dbb9bd5c21feaac7ab908ce17943e9e6b0b7e96eabc4a948e8e14dacba7d230dda
 MISC metadata.xml 346 BLAKE2B dd5d67f5f5f2bd3205f8087ee8abab196289213b451493bcb0e059f902482449329bf03e9cd44e13cb72a347b4ee97f6b1cdf771c0723bcb93b06dcda9a3cb00 SHA512 0f177f3c20fb7215c21a2df360abfdab37bac8cc8b1405d31cd76d552d65661762a929972b0bed0a4c46b7f9c4b053b9a544209282db688699208b5ba0ccec64
diff --git a/app-misc/gnote/gnote-43.1.ebuild b/app-misc/gnote/gnote-43.1.ebuild
new file mode 100644
index 000000000000..5372712a5529
--- /dev/null
+++ b/app-misc/gnote/gnote-43.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson readme.gentoo-r1
+
+DESCRIPTION="Desktop note-taking application"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
+
+LICENSE="GPL-3+ FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.62:2[dbus]
+	>=dev-cpp/glibmm-2.62.0:2
+	>=dev-cpp/gtkmm-3.22.20:3.0
+	>=app-crypt/libsecret-0.8
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	>=sys-apps/util-linux-2.16:=
+	>=app-text/gspell-1.6.0:=
+	test? ( dev-libs/unittest++ )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.35.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Build system requires UnitTest++ >=1.5.1, but the .pc file doesn't
+	# specify a version
+	sed -i -e "/UnitTest++/ s/version: [^,]*,//" meson.build || die
+	if ! use test; then
+		sed -i -e "/unit_test_pp/ s/ = .*/ = disabler()/" meson.build || die
+	fi
+
+	if has_version net-fs/wdfs; then
+		DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
+		synchronize notes."
+	else
+		DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
+		If you want to use that functionality just emerge net-fs/wdfs.
+		Gnote will automatically detect that you did and let you use it."
+	fi
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index bdd8bafaca4b..657e427fc7bc 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index baddb8a87c8f..b927883bd8a3 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,7 @@
 DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b
 DIST gnumeric-1.12.54.tar.xz 18127208 BLAKE2B e9ca517d9d305ec0bbd9d1755b2f510b88e4b9311684f83b20edf804eb885ca7951411a44ff15d7b2ff33b9b938a304532f81839c0da75413c08822b51ad2a9c SHA512 6d390373fcd85ee7090a3eaf6a3fc84b7cb3545c5b64ada59fc3c3bfe04b387a08597bdf85e53bd59e11bfd7d40e8f239eff3fd5e5ec775649836507975e7567
+DIST gnumeric-1.12.55.tar.xz 18157492 BLAKE2B 6c084f681e33f00af80cc11dbddf33166877ca30480ae6fc6b65a0ef06271c634e2ba24af55df4c6b306833e2611e959dcbd8b117c97bbf46598419ed4d124e4 SHA512 04127a353d5109e3a31d9a3bd42d6d177366cc6c5d900516b4c8a7a8fcaecc71bd4e2e94876719246841070964b393af97988cafbd6313cea135c1757889e878
 EBUILD gnumeric-1.12.53-r1.ebuild 2369 BLAKE2B da511944ca6b23eb1e76d9a6ee1c7a45efedbdadea8b08cd9ae96dc4eefa709c786124eb6ad258ebcd74df3947e1d9d136f1f7c5dd03b1357b75ea8807aa4a87 SHA512 fd5917b5adad8d7a967393353517a3b5dc599c2429c968504a89abc927ea65bd562f7e28ca584770f52c128111cfab63abfbdf3ceb0d75789c090464d8cb4b17
 EBUILD gnumeric-1.12.54.ebuild 2370 BLAKE2B 1597143ef8e5d1cf3d2c02099ce427ad8d01fe4e67543b595b4fddcb747380651106434e26a5f32be20b8b1578114e9026ec4a31feade6535a6b8a1cb431c8be SHA512 e7f5327b600b4dc3cf8a029b357e722341dbb604e75e853241da47fba0a996a83c61f88f0db06eb97520f26c5e17a5921be20d4f973065ca11ccd9ae27f0d266
+EBUILD gnumeric-1.12.55.ebuild 2323 BLAKE2B a64b0938ad70fba6618362aad807e1e1c8d335d0f0f90a91fb1b432f5f8b086e75b1d6c743f763913984dcca782c5a7c5f5ca52326725011096cd5b56fc999cb SHA512 d83800e7bb2360165e81556069aa11e1a8d39d84c3439f991af6c956e4d8f1c10d7cb32b41b5d6395084157284a0a559eb24e7148d4233da1bb2d1d86503b57d
 MISC metadata.xml 627 BLAKE2B 6704cf7889bf073ee97e1af9145395462f326aa44ad6fa04f4cc4908bbde8a486518c0f11e3a9ab887835c0af862868b8a86ca29191ac1bdf179aa060c621020 SHA512 451313a3c0d62af5f647bcdce0ac76bf1948189bb70c555f6aa871245bf3ce62b0ad306c8835a7c42b24333c3e9ce449a209d3d6967e487ec061792969092107
diff --git a/app-office/gnumeric/gnumeric-1.12.55.ebuild b/app-office/gnumeric/gnumeric-1.12.55.ebuild
new file mode 100644
index 000000000000..a5c1dbefdfbc
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.55.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools gnome.org python-r1 xdg
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection libgda perl"
+REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+# Gnumeric has two python components
+# 1. The python loader for loading python-based plugins.
+#    This component is pure python 2 and a port "is not currently being worked on".
+# 2. The python gobject-based introspection API. This component is compatible
+#    with python 3.
+# Component 1. can only be re-enabled once someone has ported the upstream
+# codebase to python 3.
+# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.40.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.55:0.10[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg(+)]
+
+	introspection? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-1:=
+	)
+	perl? ( dev-lang/perl:= )
+	libgda? ( gnome-extra/libgda:5[gtk] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Manage gi overrides ourselves
+	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
+
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-static \
+		--without-psiconv \
+		--without-python \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl)
+}
+
+src_install() {
+	default
+	dodoc HACKING MAINTAINERS
+
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5ef1188fceca..363926d51278 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
index e2d0b3886cb4..10a331e4fb47 100644
--- a/app-text/lowdown/Manifest
+++ b/app-text/lowdown/Manifest
@@ -2,6 +2,8 @@ AUX lowdown-0.10.0-pkgconfig-libmd.patch 309 BLAKE2B 617d3af07f0414fce674573e48f
 AUX lowdown-0.11.1-linking.patch 1330 BLAKE2B adffc64357e84d9f6ef82b4c85e0c7302995304859c20c5dc1c6ab3f4c32c0aca4d4c5739f43515386f00f59e4ab58a2c9d3e9ffde15a338bdcc210de5ab9ad5 SHA512 47c44d73eeac0a7b607c16afe8a24e9ee9a75672e90119cc63d577bd39db69d1dce8985a90535504f33eb1ea39728a175bcedd718730cf47fb822a0a0169aea3
 DIST lowdown-0.11.1.tar.gz 571320 BLAKE2B 28fe8cb4f164618be602770c602f3ce51c0f0e765fb9869b82cb29c50bdbe0fd92c09c10074d8968108eca59096d7e176531eb56cb2b40f1d9c00a3f944e3b8c SHA512 5a8ca9d731171b97daed7a9095bc4206d2bed9095fa267eb9270782770247743f1a096c5235fd301320418c37a478fbc71552ade105eba0e756ff687835d4efb
 DIST lowdown-0.11.2.tar.gz 576599 BLAKE2B 579a5257a0c37882c1b5269d8196a974b3ac73be146ba424a129c9421091c462769f065350ede1b8437371141c17c24fa5ac4bdc65f393a92835d6e981c5b181 SHA512 f49ba1358a6de9ab792cf1fb7586e0e326b8ba9a153c234079825534cbdc2d10b6af32d5612b11490b97dbd6c0bea10a79752bf1ad7e7d8af871aa20332fed9e
+DIST lowdown-1.0.0.tar.gz 576167 BLAKE2B fec9857ef1110f4767ff6244dcf06fa9c69a56d4b8709217cf05a148757512e2cb8c141b112673f0cffa260d7e2c376b9905bb16092e3f97f97007dcef922bcb SHA512 fe18db1f3d6dbc4fe0ae33ebcdeb1646b20d6fedd265e29d53475f7931b5b60329a653f9af864a39ff4caa0131751fcbffff0d94cb9519401a3479ada29bd7b8
 EBUILD lowdown-0.11.1-r1.ebuild 979 BLAKE2B 203bb3e6a99fd8e256c02464a3b015925e0c5a8e1293bd1c16ddad4a463ab1f11718771ba2d722d316bcb17dfa3a8ccdcc04a82aa6e86afa782e66d01deabaf5 SHA512 c7271fea2e918847f42cd24b47d95589e4d37900d433d5d56b178317cfb06647a4674f23802ba3b26ebda67730d4266d659f3359263e3bb93d6faeb6d6bcb697
 EBUILD lowdown-0.11.2.ebuild 986 BLAKE2B 3e686da048403f3cc1bc4c558b9fdb65954f19c8fa508e9ba29a389a80b08eab061f3c34e7d4b26621520939acbd1284b3b005f9233bc2aa9bb4127b0a6ca5fd SHA512 3ac1087c812d5bde06998cb830336d7d22627fccf1305243a5e19c7107c4da767da5e4f353c330af850e0e107e1767a2e3aa5fe809bc4f109bb3bdc9b40f4cd8
+EBUILD lowdown-1.0.0.ebuild 986 BLAKE2B 72706dcb72fd2513c3e813bbea4e9868b1875071eeb44642d18457b7be74bc1c697eabcc41d6916c881679a6c7a2c4be512656b94ac65de568ed760ee37eeeab SHA512 2ad6ccaaf1357c28f686b42ede75eacb92a4dbc11b9badfc34f00d9dc406ccae968df11eeb2f2d0608d365f73dc91a8636f83f9450b1f44b049146196637078a
 MISC metadata.xml 333 BLAKE2B cfa2021e507b7538cf73840fb9eb8e1f6c157f7090b1156e4bd1cd917547adeea76cc31d619d60b0d189c915ae4748437b8d9a9a96a532276d6deb1d0f2258d9 SHA512 fa991b0162a4eab9c81815b4a523d33a08e7a7716b5a443165f0cc05d906b7dc3d7da388d0e3d3202a7262a7971d771ffb29debf42659c8ed3c3de6ed184d73e
diff --git a/app-text/lowdown/lowdown-1.0.0.ebuild b/app-text/lowdown/lowdown-1.0.0.ebuild
new file mode 100644
index 000000000000..bf31fdccbcaf
--- /dev/null
+++ b/app-text/lowdown/lowdown-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="virtual/libcrypt:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.10.0-pkgconfig-libmd.patch"
+	"${FILESDIR}/lowdown-0.11.1-linking.patch"
+)
+
+src_configure() {
+	append-flags -fPIC
+	tc-export CC AR
+
+	./configure \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		|| die "./configure failed"
+}
+
+src_compile() {
+	emake $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 47f4530ba1df..73409a5e9b90 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 3dde3e9a9549..9ece20e46944 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -23,6 +23,6 @@ EBUILD mariadb-10.4.27.ebuild 42079 BLAKE2B 4dd73392405ef22c0d366e3be03d5329fbeb
 EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82
 EBUILD mariadb-10.5.18.ebuild 42038 BLAKE2B 00aa21e6ef21413fb9bbb22cefd4431910ecc9970867b6a931f3f357319e4fec6e20d78c527498b3194029ec6541030dfd7966f529db73e3217b4e0535e7523a SHA512 b3ef6c099808a17b568ccc9a1e9fbed357508d9c25f303271f8f049cd03c4eb098823bbb1b2504fd00ed49f69dc822254c03db3476504bfdbbc72c7515a19c4c
 EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d
-EBUILD mariadb-10.6.11-r1.ebuild 42499 BLAKE2B 6e4e0787a4b5585e75e2d8407a95b512a26fbfb49764dd1f8e652790dc9cf88ff54b3bc8973d486704142811ebb04e639c094138323df9f54369258da7d253d9 SHA512 9ff135404e417f02e773d9e65601d273fed90db018e18e9eaefb5a17e64cb4c0639605ed91390748ae3ff47e9ebdcc9e18c7adcf8193b97e6c67be023e2747f3
+EBUILD mariadb-10.6.11-r1.ebuild 42546 BLAKE2B 7c30357d30f311b1af8207d0b6fa15ee5e4a947ff9396b551f83077bab70c864ab72d486cb460a52e3020a8d24a877aa479ff38d3a769d4716825de3e2ca7ae0 SHA512 4e4844cd8f86dadcbf72673ebd64e189c1a4fd8225ea3737c732c23231242bc4bcc873f1e72e5f6d3701f466c3f13d63a2d62043884a92c6c589cd0909924899
 EBUILD mariadb-10.6.11.ebuild 42567 BLAKE2B 51ccc2336df1a87c36132f8da66a6b7861630ba3f2f99995fcfb883ea24dbdcde48cb449c2386f3685e920d88e2355ff84db6c66fe6f961a12bf95da7ef59395 SHA512 b5e35f356dabf39b7c7571c07c329f8bf6ac2903437b0319dbdd2deb94b02045a51e22f0206c32a9d2efed6403dbcf3f408adc6acd06e35291d3e21cf16dcc17
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/mariadb-10.6.11-r1.ebuild b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
index 5671e55d5756..18c894925298 100644
--- a/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11-r1.ebuild
@@ -206,7 +206,8 @@ src_unpack() {
 src_prepare() {
 	eapply "${WORKDIR}"/mariadb-patches
 	eapply "${FILESDIR}"/${PN}-10.6.11-gssapi.patch
-	eapply "${FILESDIR}"/mariadb-10.6.11-include.patch
+	eapply "${FILESDIR}"/${PN}-10.6.11-include.patch
+	eapply "${FILESDIR}"/${PN}-10.6.11-gcc-13.patch
 
 	eapply_user
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 27144de29a1b..24a2417173f9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 12360492b839..e206ffdeb4b8 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,3 +1,5 @@
 DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c2fcb9d8ac7af0d207e56f8229c1e6a7e6ac7c0639d88b55f6d27f697cd6e4ece5cd0768d2624ac94eedabb0c60 SHA512 21a10fcc174b3e705551a6cfcf6e1b4ccb899c9d9a69e273e3c49528bcc5d889eac0dc3dbffc1f55fa561a091f8d11f3246035499cb9168192a03c6af034bd82
+DIST bitarray-2.7.0.tar.gz 120536 BLAKE2B e8e518a8293a22c81decbf3bb8ecc83d3796023bc6e3e5b75617ccc6c13b291d27d5a707d9a88e361329fa36e6f0363f4330b382b35236079f98052154bd5750 SHA512 762628d3b24315619176bf7ceaef95ba83fc87bb49c0daa23503fcb5dd54d447b4950b75b4923fbeaace2ee8a3037f228184ca5978fc8c782eb9eb3e7dd65d8d
 EBUILD bitarray-2.6.2.ebuild 571 BLAKE2B 1635fd40baf1614ecba870ad759f2c4f418f3b2eb59ca6930c80dcd7998c8bbae73e569a39733de33aa4ff2975d8b197332cfd8bc48714f086f42c91a15185ae SHA512 2cc349c48fe5bf351395d3186eef36ac3372ad708c8ebfe968a10df830c1ecbc9c2c6fb11c2a07c73e7a9f4ece424e5da77c237a08c8bd8d2fda6b6eeb290c71
+EBUILD bitarray-2.7.0.ebuild 573 BLAKE2B 1286c5f4ec4fa2c2f47c5a6d5ba5154d2095b22739304ef585fea8c4f3ae76771d8221e4c07397c774e2bc617dbcb8b1a861a041b9d0d1fc52b709f230d38334 SHA512 a607d9a25b936692845d6be2adf4367e76d209c902b10394837d83ea39daa0b98b68adfd375bbab62e2d6916650f9fa2d163c571f0c4b1486c41c09cc91d43ca
 MISC metadata.xml 1207 BLAKE2B 67a57c61a71655fcd94e7025fe4d30792b6921a40f151d827f4c936dbc96c2b81afd2f2a302cfbf15356a591be941268561545d7ac7bc0cdb19e3f87a03e4b4b SHA512 5069c6622d7840c402007c420169e679da08db020952f798fd4299d6f1b324ce8cead3ca2a9072b96d8d852d5630827833eb27d39a190153e8da46ac9f386b90
diff --git a/dev-python/bitarray/bitarray-2.7.0.ebuild b/dev-python/bitarray/bitarray-2.7.0.ebuild
new file mode 100644
index 000000000000..3f58f0209420
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="
+	https://github.com/ilanschnell/bitarray/
+	https://pypi.org/project/bitarray/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 1f8bc9c54bc9..d85d27f005b9 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -7,6 +7,7 @@ DIST hypothesis-6.65.2.gh.tar.gz 9349189 BLAKE2B 4a36cde376a56c9eee7645c76606777
 DIST hypothesis-6.66.0.gh.tar.gz 9349578 BLAKE2B 3dcdd9bcca00849d68a4bf1368784099bf69e25634b7d1dae13b40be2ac67959151c1b9cdf233349197de1a0f100d57baebbeb9a691ce56ec2d81d21c9f48989 SHA512 a73648ba0b4e3a0621e843ad3ea32f3f692374b82881b096c86a9609f4f7d1a277dd5265a4104863c648c6d5ee4dbccdb1d80ffe62bcc303f837cea26f7d40f2
 DIST hypothesis-6.66.1.gh.tar.gz 9349822 BLAKE2B 728b6e1cb2a28a07cae066bb2e2f8099f21f9a27dbbcc27db1c4f97f6541f60464d90344630df75eb5cea9a65e865a296dbd8b5e20bcbbc17840c92d8f269ac7 SHA512 58ddb6c2bb77064d25ace1740bc5a9ba4d4b6c311da065aa065854c19d4920ec9d70b83935e1b9d057eb10c96c4fdfb445d17c6f321578cbde449df3c5edf704
 DIST hypothesis-6.67.0.gh.tar.gz 9349921 BLAKE2B 03c2a16a1895ed45d9b902c378b6f5d55ef205999f7e69f4405a350b615e6dfccf225c76a193be412efa16d9e13a86a8f003955738e53f669578c01bca30ea9b SHA512 9ce51254d3285d859c877bd2a074fc837ea817f9eb8dcc6b4048d5af4650a958da66f5d46b7e68108a98fe0b4b6115fa2531adb43b94a4f38c8494c54b0e9a9d
+DIST hypothesis-6.67.1.gh.tar.gz 9349899 BLAKE2B 279c0d6e1c690174ad5b2f2fa4c8eb42eb5f319d20b7fa362d8c69632ed05d54251e0a09a5025ef090df53d0660cfa3b4925b721ceadbad3cd59a64ea2ed882f SHA512 ea89f7cbd5bb1e5756a24da4996c3420f8eef5c7db543004d66d023bdcd05687c3d09d6b0a4213af42f449ea3c7c5140a96410cf94de15084a421c7cab95504e
 EBUILD hypothesis-6.62.1.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.63.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.64.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
@@ -16,4 +17,5 @@ EBUILD hypothesis-6.65.2.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d3171848
 EBUILD hypothesis-6.66.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.66.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.67.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.67.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.67.1.ebuild b/dev-python/hypothesis/hypothesis-6.67.1.ebuild
new file mode 100644
index 000000000000..c793a8a143d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.67.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
new file mode 100644
index 000000000000..c6d4cabfd3ec
--- /dev/null
+++ b/dev-python/nbxmpp/Manifest
@@ -0,0 +1,7 @@
+DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
+DIST python-nbxmpp-4.1.0.tar.bz2 132973 BLAKE2B b28b7e24debecd5088234d8eb862aebdbd461511c02f0bf8b45429c3b1964706046fdc773d654b4dce7a6ec62cc1f58e5caf9f9ef2cc0c58603129232e658325 SHA512 fd977ba9e4795abec8e1367462e7ae8c38671deea1e40849e84350bdab8281595f839848a8dff6fa730f65c5b60d82826b4d660ca2f14519ce2db0bd5f092782
+DIST python-nbxmpp-4.2.0.tar.bz2 133803 BLAKE2B db63b5ca085a90913ba6cac07c214e2528bf629bab24f7256ee751fb3ae4ddf417a9d09c509a259d468fff81feaf890b639bb9145b02c957fe777101bfbe7afb SHA512 8927b867ece2be1a2610cc5221615f026bd84b242a2d257740079f86aaa61c7f6208e90c8051f570d5539189476c68a316f840240ae0a6372311f353182b2940
+EBUILD nbxmpp-3.2.5-r1.ebuild 798 BLAKE2B c5a53c25c177b51344a80efc8f9f723ebf26b6b934b5b8d09ed2418a5aec552625efd3ddb27de9d4492fc468fd7def31b3affc8d6384a5a2e2792711178eeb02 SHA512 a0c4d39a2df8f8904c45c9166bb13e2f3ef095591d614f62d47a0f95419f159d846fdd9899e525be8d718ba4f59d5bd7530e7855f7507e4dc19bd231851c9071
+EBUILD nbxmpp-4.1.0.ebuild 849 BLAKE2B c4f7dce603dfdb234fff6d102320c40507dad8e243b115b628d26c2167ea8e129c3d5ab73114dfb76c703ca428d94416d5ec4c4d226d358aa3be8bb29407140d SHA512 3182448a3a91bee4a04e678109bdb2a293d337bf8406cddb175b64fb50935cf37d5efe4d71b630475438d6c86a921373858b7c55d9cdbade80a7cad0b1bf4587
+EBUILD nbxmpp-4.2.0.ebuild 856 BLAKE2B 451428e7b688a1e47d01117451ec63bda581e9019fa1cc9c639c590477011f09effbf5343e6a03bfc8e4d6e89d6c8d92a9f0c73a00c330d75f3dc6691057b31b SHA512 2883a578e813aa257aa0ffd231d9029aff97fac597d3335124d702cfd5b93f9e6e935b2c601b22c07f505b1b7356744df6b99616d518f5913ab64782dbe4ae2a
+MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/metadata.xml b/dev-python/nbxmpp/metadata.xml
index e43d3f1339a6..e43d3f1339a6 100644
--- a/dev-python/python-nbxmpp/metadata.xml
+++ b/dev-python/nbxmpp/metadata.xml
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild b/dev-python/nbxmpp/nbxmpp-3.2.5-r1.ebuild
index 3bbf41814a17..1b483f172fab 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.2.5-r1.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-3.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,14 +8,16 @@ PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
+MY_P=python-nbxmpp-${PV}
 DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
 HOMEPAGE="
 	https://dev.gajim.org/gajim/python-nbxmpp/
 	https://pypi.org/project/nbxmpp/
 "
 SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
 "
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-4.1.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
index 9c623ff343b7..68b1414870d9 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-4.1.0.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
@@ -8,14 +8,16 @@ PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
 
+MY_P=python-nbxmpp-${PV}
 DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
 HOMEPAGE="
 	https://dev.gajim.org/gajim/python-nbxmpp/
 	https://pypi.org/project/nbxmpp/
 "
 SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
 "
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-4.0.1.ebuild b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
index 42ace81c1333..570d6eeeb400 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-4.0.1.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
@@ -8,14 +8,16 @@ PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1
 
+MY_P=python-nbxmpp-${PV}
 DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
 HOMEPAGE="
 	https://dev.gajim.org/gajim/python-nbxmpp/
 	https://pypi.org/project/nbxmpp/
 "
 SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
 "
+S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
@@ -25,8 +27,9 @@ RDEPEND="
 	dev-libs/gobject-introspection
 	net-libs/libsoup:3.0[introspection]
 	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests unittest
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 57d52168420d..669049e41202 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,3 @@
 DIST pycparser-2.21.tar.gz 170877 BLAKE2B ae6bf42dfc552bf1e3bfb5430cdb0c15b5e011ec53cbd03e0e2507c08a1a78690cefce2de134bd984caccc5dbde90661cb4c18df5c289217967213aac4d52404 SHA512 e61fbdde484d1cf74d4b27bdde40cf2da4b7028ca8ecd37c83d77473dab707d457321aecaf97da3b114c1d58a4eb200290b76f9c958044b57e5fed949895b5f0
-EBUILD pycparser-2.21-r1.ebuild 1779 BLAKE2B fbdd2c5116a1426ddd942c29f0ddb391dfbbcbaa7a8fcf1475cf9a386fd4c919efc2120665a2cef46ba5d54d6cd4c204826d58c467e44b5c1ae289182ee117f0 SHA512 f0313b385d0fc9566ca5aff66e9a626ebd714ae170228988d6ff3fa729830be5d3d27953b148de90dfda8af954ce535ae682866937c317ea9f230d75be138ad0
+EBUILD pycparser-2.21-r1.ebuild 1813 BLAKE2B f009abed1128e42cb7e6e6ce61e12e3a39d806c2eaddff92d37698435b1c9a053a93aca15da21224405267533e9aa789114fa2eed364fa20e870e0709883f13c SHA512 c4e87cc3402b05f425a70feb709b8727c7d602eba07d42d2d2670d646b7c6f01794b639d95e5ee16c11dd1b2af9a8aab37abb47fe527a4a31179fe2a945d07e3
 MISC metadata.xml 406 BLAKE2B 61cb250ac460c4ea05f47bd8d208e44706bc80965ca1982e490d759d3a63652e5e13bf357532afb599ecea491f3c9a4cd315b97250b115bb7e8fa769b2ef03ff SHA512 b2d4ffde31f97a98e4a74bdd70751519d1339bbf3384e9e671760506fc2dac9d92bf6f7a743973002b4ae6da1cd2bb11abbfe63cbb330a1c32702b3eef24a62b
diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild
index 1b0d8e6f6901..3b32ad92c905 100644
--- a/dev-python/pycparser/pycparser-2.21-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild
@@ -43,6 +43,9 @@ python_prepare_all() {
 
 	rm tests/test_examples.py || die
 
+	# bug #701878
+	MAKEOPTS+=" -j1"
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 9b47b8c44daa..5d395e005f56 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,4 +1,6 @@
 DIST pypdf-3.3.0.gh.tar.gz 6803536 BLAKE2B ff70995882581c816fbf7410232c68e9649632161b4927543924a11b1a0a816f1178be399079e32078fe8d89a2aa9cd0eb1562409dc8e7bd388cad3afde37198 SHA512 5db25d6c4b41a1d19b45fa907f53e0106e01c93eb4152079dc4ffbd7bf28fbf8915bf0e3bf1af4a371e805657884fe2c42de4856944085ca7bc07a477f3ba588
+DIST pypdf-3.4.0.gh.tar.gz 6931831 BLAKE2B 037ac998cc1e3d078281b64183197678a80345731f6d4691b00f9e546eb61eaa34c4d7f4b704191c887975517da73359983f1b7405776e99257f79b1604dafc0 SHA512 9bee70a039c42533b600f1e95e28a4889d7df212bae18deca7d88501008d3a3e2b4d7fe36134e947cb14b0acc650126688c358ce2b662917a4c6df46241db1ab
 DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
 EBUILD pypdf-3.3.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
+EBUILD pypdf-3.4.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.4.0.ebuild b/dev-python/pypdf/pypdf-3.4.0.ebuild
new file mode 100644
index 000000000000..646a669f191b
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/pypdf/
+	https://github.com/py-pdf/pypdf/
+"
+SRC_URI="
+	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+S=${WORKDIR}/pypdf-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
+# 150+ tests require network, too many to deselect
+PROPERTIES="test_network"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# rely on -Werror
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_orientations
+	# dead URL
+	# https://github.com/py-pdf/pypdf/issues/1526
+	tests/test_xmp.py::test_issue585
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
deleted file mode 100644
index 258b175ef9f6..000000000000
--- a/dev-python/python-nbxmpp/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
-DIST python-nbxmpp-4.0.0.tar.bz2 133902 BLAKE2B 8b86f58f5a21a5e4f473528fe61f0f7db8d3cdeb4bad5f5c98d6acafbc3ef30794431cd2bb437754549b3bee21252cbdbf37e69c20461a5facc0b455f631edaa SHA512 3eb9433529d2971f495bf683d586bca63c238eef96f5f6c6082d02a8fb0d11374302ddc0f718a7ff73db624d3aa3a8325d157b80679c165077dbb9d4dc490e3a
-DIST python-nbxmpp-4.0.1.tar.bz2 133863 BLAKE2B 83fbe4b84b47fd4215e5041d28c24fbf230f56f6bf097e83983dc5c48b92f520a36d02636cb0a76eb5a97f04df7c0869c4a59b124354b484697b78aafbc45a8d SHA512 eb9907d5d985ed72a0b4d004e3f2e607e4786a826fc2b5a612a695af3f4d3ca5e4edb127e9bf14edf2f52e7902a80f5c9958bf3cc6ade4446d2aa117b4422aee
-DIST python-nbxmpp-4.1.0.tar.bz2 132973 BLAKE2B b28b7e24debecd5088234d8eb862aebdbd461511c02f0bf8b45429c3b1964706046fdc773d654b4dce7a6ec62cc1f58e5caf9f9ef2cc0c58603129232e658325 SHA512 fd977ba9e4795abec8e1367462e7ae8c38671deea1e40849e84350bdab8281595f839848a8dff6fa730f65c5b60d82826b4d660ca2f14519ce2db0bd5f092782
-EBUILD python-nbxmpp-3.2.5-r1.ebuild 749 BLAKE2B 866d7ca9a604d2dccdbe37106015c9e97d881b14b636210c6268a967cbae2b8dbda1decdde926beb50f1bbdca65f7c995d46665386dece17dd7393f0393ae87c SHA512 801a98e2620648d92fbd1f5de5c27733a8e476ac7d34427ee4fff51784b0b8f9cc38288a2d500d0feb4e47bd1f2b2489d9923dd4817dce1f67d2291875064a0f
-EBUILD python-nbxmpp-4.0.0-r1.ebuild 752 BLAKE2B dd9a59a35b4beb1a6d59074e71e4313428738b7dba864293230bdb79b5ad765763f2bbb4180e49b078ab997624cb7f30ffc9a254d023304fc5effc529b1c1eee SHA512 0690b9092b5334f54b88a19605f6e2396d19492bb2e1cf1043cc939bf3c82300f7b65bcfec648b53f5d35605c1451303c1fe5d3b64179191e3a1e22663536b13
-EBUILD python-nbxmpp-4.0.1.ebuild 752 BLAKE2B dd9a59a35b4beb1a6d59074e71e4313428738b7dba864293230bdb79b5ad765763f2bbb4180e49b078ab997624cb7f30ffc9a254d023304fc5effc529b1c1eee SHA512 0690b9092b5334f54b88a19605f6e2396d19492bb2e1cf1043cc939bf3c82300f7b65bcfec648b53f5d35605c1451303c1fe5d3b64179191e3a1e22663536b13
-EBUILD python-nbxmpp-4.1.0.ebuild 800 BLAKE2B 7d93698bab6d334a99fcf4244f435b0c71ce3c573431388ccf95db7abc036b741cf136b5670a273321fa9c791459c6ef67db7b6973830ffac6507d8c620c42c3 SHA512 f8ebec848d16719965e1e1d1f50180facf1e6f06630bacf762f20aa4eee70c25940e3c90db76fe1e6d7038c61b32d50b8e89fd30f018514eba1cf26cca5daff1
-MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-4.0.0-r1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-4.0.0-r1.ebuild
deleted file mode 100644
index 42ace81c1333..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
-"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index d869c26a23cb..92baefcf8974 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,7 +1,9 @@
 DIST qrcode-7.3.1.tar.gz 43495 BLAKE2B 9986ee77752625e127008038c6c044b5adeb3bd526c27a55b23915190c3c9069adf1c6df1ce5f76cd0255f45319ecb66ebf226932666ea6c89872a46e13c1cd9 SHA512 9e0e508418164926a074d8c6d85419b39a36c01ac6d92415a15ce43d4aea79fa2a8d0167982f832970d2a68ec18d2b729f09e15d80b4f4c33b992999527d39f9
 DIST qrcode-7.4.1.tar.gz 535765 BLAKE2B 34ccf9a376a408de935ab4bd58ada6f9b97c79a118aa6aa17414e7c6607cad5dbf18e63b62a0df696fab6e6a4288af1a0690476d837d4549ee486645fd84081d SHA512 46e16b27f4b30f6b9d30a7b1dd12fea1fff9695f7cf3e8df018fa7118ce45446bbe64188d4669a62d5d094b3864f9064ed02afa63ac7ae37d7b54f59fe48e22a
+DIST qrcode-7.4.2.tar.gz 535974 BLAKE2B 250290bfd31079d91133f669138d7172529e99c381836a74c853061c01666df09fb99c445d705d5f0c02a975810bfc4853c2ec616974849b1834b0ade3917c48 SHA512 a8642845990341034e39c43ef674f5b4ce8d3175a44d6062f711af2c24ffd45bda5f3ecf8a7825b7ebafe734b6396d52a37bb59177c544f921e43eaa9f1f5405
 DIST qrcode-7.4.tar.gz 535636 BLAKE2B 93434750d127eacd21ef44490407ad0ab4b1bc292681713b1ed11782b84e86e58548bee27b6e001c2235a1fb8af8a7166db8ebbbf468281ca312b31288e8dfdf SHA512 33be094ddb0a280704e49e2e06c37100bee282b9cf2d0727ccdf07557ad793f4b71ef250cd3eca0166fd9870aa76c936d8426c6a964d241879a67dd9a5765be6
 EBUILD qrcode-7.3.1-r1.ebuild 790 BLAKE2B 08abc656e370bf621154ff454db62d3229aa16b8cd305367ac12279a20241df501d29ff43ed6d1bbeccd707ae564c84b6949c7a671163c5b8fad3b485d98aaf1 SHA512 5c9c94658a6b0cbca24ead1c34aae9a03d2b9eb31709e635034234fc874d2153f7c1d8ea9c79533a237234744a07def3709e06689e3469d6acbd64820e2ec28e
 EBUILD qrcode-7.4.1.ebuild 885 BLAKE2B 7ae7221bc75d49579e676f23098a08bcd33a1faa29c0e719248f95a25d8d1a395ce39f3a603f69406ee42e9fd82b9b2ead6ddaadc8bad04d47ef4e570af0bf0e SHA512 4d69a01faf1a9be7a81227fa237f284a0249b3e8a56b743a8d2d3e950df3cb52469985c51162a3c2bf2ab1811ad13c9228a20bc6431e4cc93615f3d27f0bebd2
+EBUILD qrcode-7.4.2.ebuild 885 BLAKE2B 7ae7221bc75d49579e676f23098a08bcd33a1faa29c0e719248f95a25d8d1a395ce39f3a603f69406ee42e9fd82b9b2ead6ddaadc8bad04d47ef4e570af0bf0e SHA512 4d69a01faf1a9be7a81227fa237f284a0249b3e8a56b743a8d2d3e950df3cb52469985c51162a3c2bf2ab1811ad13c9228a20bc6431e4cc93615f3d27f0bebd2
 EBUILD qrcode-7.4.ebuild 885 BLAKE2B 7ae7221bc75d49579e676f23098a08bcd33a1faa29c0e719248f95a25d8d1a395ce39f3a603f69406ee42e9fd82b9b2ead6ddaadc8bad04d47ef4e570af0bf0e SHA512 4d69a01faf1a9be7a81227fa237f284a0249b3e8a56b743a8d2d3e950df3cb52469985c51162a3c2bf2ab1811ad13c9228a20bc6431e4cc93615f3d27f0bebd2
 MISC metadata.xml 399 BLAKE2B 35c778030a5c082a2b0683513dff8b6a3e1f7869e031c1d24618c1b8a6259263d57c140e18e792c5f10cd7c8790b3c146472f48ff44bfa6c0eafbadddb9b9b26 SHA512 e56f4843622c02c2e97efd1f319db4ebb017672330cd97f339136a47c56d697fd2885d830511c8755b918e8a46daee87dd33fade2ac54034f5251f909a09e6b9
diff --git a/dev-python/qrcode/qrcode-7.4.2.ebuild b/dev-python/qrcode/qrcode-7.4.2.ebuild
new file mode 100644
index 000000000000..03f7ce68a631
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="
+	https://github.com/lincolnloop/python-qrcode/
+	https://pypi.org/project/qrcode/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9.1.0[${PYTHON_USEDEP}]
+	dev-python/pypng[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	qrcode/tests/test_script.py::ScriptTest::test_factory
+)
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index eca9bfdab655..5fc74cadf0f4 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,7 +1,9 @@
 DIST simplejson-3.18.0.tar.gz 83533 BLAKE2B 83c6f7f3734507f5a96b51d52dd39b0bd8ff772d51ce1f12ff2ee68f83747f519f418f78247727af7c408da4e7818d1b0d1f7b54b7780e3bc427add1eeaebb06 SHA512 952177fc707e5b1fb6450093876f9a7af1026271cb792bb8dc0418b83906ae32e7f2251b96f531101197d0b3204a97124bff02f7abc4cf700da4edf1320b6b08
 DIST simplejson-3.18.1.tar.gz 83603 BLAKE2B 5f51d06238210b0bdd3dbb2338979023324e1056c2278f7eef7b929cc0bf9f9178d032829a3ce49c0b630f3367268d68753f250968962159e9a9aafcd3105d20 SHA512 3a18d02f42624e27c536582cf9b6ceb8559d54dd97224294a6f6ee8173ee37c0cc9cd21bad777c29ab432ac41b1495fca9d45da300b5040c175980d236d3b9d6
 DIST simplejson-3.18.2.gh.tar.gz 81518 BLAKE2B 317ea52890a1bd48fe2a647eeffc9f8a9366c62a6e40fb91a2c154bd49fc3ec9d29c18aaaa4866962cf40d86e256abc090a19d891885171d32faac8344f2e17b SHA512 ef19e513bc45afacd746bf7018165e90a001dc6a91b7f749d8a0b0272283885bcaf6fa77d8e05e18805310e0ee26529dd83cb947bb25fbc3890898ccafe68a8e
+DIST simplejson-3.18.3.gh.tar.gz 81540 BLAKE2B bf6a162499b28a362638e19735f668571f88943ae396fb7f813d51ab0684caa8cb996a35deaf1d68adee2a812d685058e9e80d6f6e66604bbb7c704051b0b37f SHA512 54223e08775ab6277722342084bf56684588dd9dda574428cb73b791d37d0b74decef6082268c0389cc4586a534a19e62ec5738fa9ffffaee63f68e27fb465c8
 EBUILD simplejson-3.18.0.ebuild 673 BLAKE2B 92bed311cf874ccc1dedcf67ff7846caf625b0dfb54440d605c725d4afed0424750ea2aa4203cb87d4679b8c0b624ab19a88c53026a74c22c1a882438d5b0e48 SHA512 5522bc25807604aac47eba679ea2486b268ace629963ab4ace68228a0fee72a878752a2214f9425a4870f8135756f3a836a809870972f6d70c6a7180a22f967e
 EBUILD simplejson-3.18.1.ebuild 681 BLAKE2B e28c9d3b74b35af9568980ed8c270468075f8b1cf5acb42b5dfec9dd34c63d5ac32dc531f05699f03af6068a10e2d0537595b45d4eb13753ac6f9dfe0a6d2094 SHA512 70ed0e9cda6c7e60cdf4a1edeefcaf20c409374a05243080d19dc040f3e06d9c6a4db89e72518c6df7892be599c5c9b8de378c64bfffbbf79e48718eb88fbb05
 EBUILD simplejson-3.18.2.ebuild 964 BLAKE2B 4d3455a1725c06da1fe7c9738bcc9aacbe14d7027e8a1691720412ad7f21a99aea1e1e8cd08ce88e151087d9923c12192e94bc44c0fc62ec732cdb9225730236 SHA512 2efa867ff8fc47c962c0ddcec15bd9cf46e76f6505b0e77f5c471aa428e8b125b1bd246522356e2065c9a4b5e48fc4670434eb9be7b89911be22ca52d9f406b4
+EBUILD simplejson-3.18.3.ebuild 964 BLAKE2B 4d3455a1725c06da1fe7c9738bcc9aacbe14d7027e8a1691720412ad7f21a99aea1e1e8cd08ce88e151087d9923c12192e94bc44c0fc62ec732cdb9225730236 SHA512 2efa867ff8fc47c962c0ddcec15bd9cf46e76f6505b0e77f5c471aa428e8b125b1bd246522356e2065c9a4b5e48fc4670434eb9be7b89911be22ca52d9f406b4
 MISC metadata.xml 522 BLAKE2B b8b8fdade498ef65f4d5d6e30bc9f0708390f3d064a332d04f0b33346224c59252ef3d512a5a7187c637348201829ccc83254cd898e8df06dff314e857debb58 SHA512 1a1b53900ef62d4d40977504378dce3ce15f1c56ae5a73263127f5919674b1f9b13964128550e0c0e274d4bf50f2c2b438626e3ba1a5f8436071e1eb2f4c30af
diff --git a/dev-python/simplejson/simplejson-3.18.3.ebuild b/dev-python/simplejson/simplejson-3.18.3.ebuild
new file mode 100644
index 000000000000..e517c93ea2be
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.18.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="
+	https://github.com/simplejson/simplejson/
+	https://pypi.org/project/simplejson/
+"
+SRC_URI="
+	https://github.com/simplejson/simplejson/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="+native-extensions"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
+
+src_configure() {
+	export DISABLE_SPEEDUPS=$(usex native-extensions 0 1)
+	use native-extensions && export REQUIRE_SPEEDUPS=1
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 4d5604d8248d..e0e1c0554801 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,5 +1,7 @@
 DIST zipp-3.11.0.tar.gz 16799 BLAKE2B 96cbb86e4c112a2cc0bbd8cf8f7a6d0e7b5a5b4af0857bfea87583341e7d08c9f0879f8455131f81e21ffb75bb362fb312c5575a8ccb2e2996313fe3f95ffe36 SHA512 10e1eca131063d9e34db18320152ea5e2445585802e7814fcb0a0aeddd8eb5481c60c2eaca1f7f2729826aafd4004fc4a0b8ee26896c833f789752a501f77e86
 DIST zipp-3.12.0.tar.gz 17705 BLAKE2B 7159d45deb7e22625a270c7f6a5610f64c511ebde11b42769730245befc679750390928c89cfe2ef979df081b07f87e35eea9d82d7063513ac420afc8e60cf79 SHA512 922d293dbfdc1871d339a6ebc0176cb5147518f281daf685318d08f6bb4057eb4c49380e49a220c6fa17d749eb8a32b9fa90070acb953f17595d1e509bc6cdf4
+DIST zipp-3.12.1.tar.gz 17987 BLAKE2B c3c9f9d3243a2863c4b310e825d9862f379386fc05d0053a10b25fc6706f1bedd5fbb65e44fa9d4ba595b87de89c7f1aa98a4e2911dfde3ce9cad71a8571a1e9 SHA512 3a7aae6f377736711bfdb7667b40dc03b32cbb765aee2a36fb5848458469c175fd7fea5811d962b97a0779d63d39d0d42a59d7174db318fc6c32ff6bb58416c1
 EBUILD zipp-3.11.0.ebuild 1579 BLAKE2B b311be46ee40b899db7afecee2667e4f340a1c6ca18dcf53a5858d59fb4439318ef10a264f8c6efcb686c01da719224ef7765f76072366356986b9451e75cb9e SHA512 da98d810c8e52d48f40c46d9f03692d5f35a8201d641702db6f0345ceeb957927bc4cbd1810a7e1c3313ef5abfe4310b88fcdd68efa416f9ebcbdee93036b990
 EBUILD zipp-3.12.0.ebuild 1587 BLAKE2B 3da2bb496f27e559a3362526ced24737942e185efa685755d1a5409d65b56b2c46932c59535e9cb80a30998bbe6123dced260287ef23a0160bdfd82acdaf9210 SHA512 af6988be2d73be904668f8e67587efc31f7600314e2a4f9da8ed176c395a31c1ebb949d0f69d32ca9e7a80365b3eeab4365cb198fbb0fffda96a858b43d1f77a
+EBUILD zipp-3.12.1.ebuild 1587 BLAKE2B 3da2bb496f27e559a3362526ced24737942e185efa685755d1a5409d65b56b2c46932c59535e9cb80a30998bbe6123dced260287ef23a0160bdfd82acdaf9210 SHA512 af6988be2d73be904668f8e67587efc31f7600314e2a4f9da8ed176c395a31c1ebb949d0f69d32ca9e7a80365b3eeab4365cb198fbb0fffda96a858b43d1f77a
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.12.1.ebuild b/dev-python/zipp/zipp-3.12.1.ebuild
new file mode 100644
index 000000000000..ea6301a426b0
--- /dev/null
+++ b/dev-python/zipp/zipp-3.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
+EAPI=7
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
+HOMEPAGE="
+	https://github.com/jaraco/zipp/
+	https://pypi.org/project/zipp/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# speed tests are flaky by design
+	tests/test_zipp.py::TestPath::test_implied_dirs_performance
+)
+
+src_prepare() {
+	# dep of disabled test
+	sed -i -e '/func_timeout/d' tests/test_zipp.py || die
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "zipp"
+		version = "${PV}"
+		description = "Backport of pathlib-compatible object wrapper for zip files"
+	EOF
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b7000de41ca2..f287d6a1003b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index f7ada984ffae..5358093a45e9 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
 DIST gnome-builder-43.5.tar.xz 10289424 BLAKE2B b0676ebf4b475a6223a57f79d135371d3cfcadd3d4dd37abf48f000f9fc0d0b3e48fb615bc07ed1415324f7661a8f4c7b05c3f31f41a70870f9c4b320d33160c SHA512 24533109c0be9bd595b04ab2abceb2a894034c648837181e8f21fb52e54b8f0e0d043f4d89ab2fff0f84cf0114d3824e05fc8f466745e9e4b577f298cafb483f
+DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
 EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B af7facf902f7d84accc297d52f4835723f33afa2ba1582047151e984f3a36a187318b2951c4aa49704fcec149c7e249e3d988a98026f359255265e72f2556f86 SHA512 3a32edf77f4eb16ca9a4ca0e4b451767d79a36c97910e3c775e8c54696d246383ba9d85d44fba15dd27f1fb3ead680d98f31ec5d02c686eb04a26b04d2825caf
 EBUILD gnome-builder-43.5.ebuild 8734 BLAKE2B d07c20305a6dc16056df0558665675e8e2e27a2564b02e5cb3f5fdcc145fd14b95c8079c2ede5322b18b1fc8a79c4ee21a9ee0aa804dd12aadedee57137b585b SHA512 2af6fef459ecebf4b2cae7808403a5536afe8c870663ac0661ee6c294588026ae8a25513dc790bee78bba0ec628c45f7d6438cc8d53e7c5bb85277f3e355b17c
+EBUILD gnome-builder-43.6.ebuild 8734 BLAKE2B d07c20305a6dc16056df0558665675e8e2e27a2564b02e5cb3f5fdcc145fd14b95c8079c2ede5322b18b1fc8a79c4ee21a9ee0aa804dd12aadedee57137b585b SHA512 2af6fef459ecebf4b2cae7808403a5536afe8c870663ac0661ee6c294588026ae8a25513dc790bee78bba0ec628c45f7d6438cc8d53e7c5bb85277f3e355b17c
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.6.ebuild b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
new file mode 100644
index 000000000000..ef2c2fc96d89
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2
+	>=gui-libs/gtk-4.7.1:4[introspection]
+	>=gui-libs/libadwaita-1.2.0:1
+	>=gui-libs/libpanel-1.0.0:1
+	>=gui-libs/gtksourceview-5.5.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.42.0:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.0:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* virtual/rust for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=true
+		-Dplugin_jhbuild=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_shellcmd=true
+		-Dplugin_shellcheck=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_sysroot=true
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_valgrind=true
+		-Dplugin_vls=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index ab30077b413f..ee440f7bf3ff 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -16,6 +16,7 @@ AUX hip-5.1.3-fno-stack-protector.patch 788 BLAKE2B 8f9d01ceeec2098df4d49e116c14
 AUX hip-5.1.3-llvm-15-noinline-keyword.patch 829 BLAKE2B 39b859e90acacd2eccdd60b690e1d882b63cfa66ff1b12effe447b18de72ffd61dd32983552f9ae39b384c3bbfbbcfd59ff2bb47943c1340bf6c1df5cb7d4075 SHA512 1933e883f84451e8512669572ea03dd25c916c6baeafac27b07e3d4a5e89165952a64afaceade4546e7e2d4473aba9811ac21131f283f9680d35e777ad9659a7
 AUX hip-5.1.3-remove-cmake-doxygen-commands.patch 896 BLAKE2B 35640516bf416760db69b736d72c1e78efdbad8a930d621fdaffd13c5c250f5d80a6975c1e4c368389ce8059aee964c36645f420d0844141d09463637ba0bccb SHA512 b1288e1f4b7553c5bf0fe38a46fbdf269ca5c01fd8e0e225b9454d4916092601d565c57eaf9f716e06fee816e41cb3a948884060551b5a9d71da9b1a050765f9
 AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226
+AUX hip-5.3.3-correct-ldflag.patch 1196 BLAKE2B 93c0e7e92c898cfa5d39d008f8c18d82b9032d3f865725b59fb4c0fef263c9a7c4108ecca9f406c21411d72781b88fcacbd7b1e50cc6dd5483cbe89a37b9a2fc SHA512 7a81444c6f2b1a70a451b13440235ba14e058f9023abfd56502ad2ba12a00e31970873b92313a7888c3794083d0c011ce8a314b43e835e9fe872ad97de4e758f
 AUX hip-5.3.3-disable-Werror.patch 621 BLAKE2B 9bcdec821484ac20343e1352e3c3d5a9297f8e7ab81ed135c5b27f11dd0667c68939fe04157ae8b7dacc5cdcbb6631e0a1b66d6cc2cd796f6322b6ded75055c7 SHA512 799c40b5a2524e166aa674c432c7bfb93c03fe00832680a99cd701b2498cd33c52e5582f9754161173f17048b6ae346a7a5b6d59eddce8696670b1f229858fef
 AUX hip-5.3.3-remove-cmake-doxygen-commands.patch 976 BLAKE2B edff02ed7b2371739f1659a93ecad9485045091ec48c6aa018d8fde3a9f4a9a48bdcf0cca660e03b4f3ff0e6c4f019068019407f429913f8c3231cdb252b0464 SHA512 f6835f74fb34cd4a9ea0db693eff6e57c742f6912b29046f7b01b87037c014cdeb38f17dd0a6b90dd823656e2957b2d0bc981eb0c71221994ae455cefc03805b
 AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d
@@ -32,5 +33,5 @@ DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa66678
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b
 EBUILD hip-5.1.3-r4.ebuild 6561 BLAKE2B eb04725deb7efa065bb83a127a298fbf24c768e2251226c1e1c246e09dc4107486bc2bd9a4e6ec7cb3abdb37a58638fe41456eda5e96ee3d5d6529e4b87ff20b SHA512 d3e3559331ed80e7e880af4b95bc27359dc8afb0fbde6e9beefe511b1ac96e086230e55468533d7882f6fe3ad26d734b2ec0c4d53e300bc2d13b551e608dc217
-EBUILD hip-5.3.3-r2.ebuild 5085 BLAKE2B 664fc12c3a17c33aa01a5b54f6054217c84e9dd68fa949d465663d6b486ac74550fb6da0e8a847756b65460f0d91d3f24dd50de8b3ffe5921e4c6742e856f31b SHA512 75a9d6e6c59ab7947cc6ea6e3a0ee697e9b2d445426482db8cdde031896899e78fe074a453cbaf5bf075c5d6ae71bd42dddbb8f850e558c7853e0c8ed7b4b1c2
+EBUILD hip-5.3.3-r3.ebuild 5140 BLAKE2B ca842dcb356db6820082b19eef1603fb206f3d5f96973f86443660c7de601da757643f9ced1b702574b63febbc770942d5a32ef90f55957ba7ddb8c94ec33d82 SHA512 3027a98f2f1e135ca22b5dee40905f11e4299589093b6d4b345893dbff90a7d6b6ce28a88339ba4159d2a4f843099f83e2bf5a95b26242882d6700462355b7ac
 MISC metadata.xml 729 BLAKE2B 92e36c42f6d8335e5a8e3a86b591ff9e6306e0d187644620fab7f8f7ddd00156ee91ff49184ffbe379e509f2096c51c421575a69de7abea3c0b372fdcec52ccb SHA512 84fc8234a5fdf54bf43228c2144d809a461862fb45fea24bf366ee5937df3882c3332429938792981e37dbb4cda6e5d7e05ac5deaded34d8bcce1eb53df8d0fd
diff --git a/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch
new file mode 100644
index 000000000000..20d117841c2b
--- /dev/null
+++ b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch
@@ -0,0 +1,20 @@
+This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which
+causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm`
+Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820
+===================================================================
+Index: HIP-rocm-5.3.3/bin/hipcc.pl
+===================================================================
+--- HIP-rocm-5.3.3.orig/bin/hipcc.pl
++++ HIP-rocm-5.3.3/bin/hipcc.pl
+@@ -711,9 +711,9 @@ if ($HIP_PLATFORM eq "amd") {
+ 
+     if (not $isWindows  and not $compileOnly) {
+       if ($linkType eq 0) {
+-        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
++        $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
+       } else {
+-        $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 ";
++        $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -lamdhip64 ";
+       }
+       # To support __fp16 and _Float16, explicitly link with compiler-rt
+       $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
diff --git a/dev-util/hip/hip-5.3.3-r2.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild
index 072b8d319e97..c11b85e3f2ec 100644
--- a/dev-util/hip/hip-5.3.3-r2.ebuild
+++ b/dev-util/hip/hip-5.3.3-r3.ebuild
@@ -77,6 +77,7 @@ src_prepare() {
 	pushd ${HIP_S} || die
 	eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
 	eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch"
+	eapply "${FILESDIR}/${PN}-5.3.3-correct-ldflag.patch"
 	eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch"
 	eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch"
 	eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 5f55cf937a23..8c9f8465157e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index e27dfe2af3a5..766a05c3cf0e 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -6,38 +6,60 @@ DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bytemuck-1.12.1.crate 38293 BLAKE2B f714ba0b4b0d693c5b26a3bcbe9de8c1496851a298bb70770e6284ed68caea61d7b8c14d67ed0e8b6d9146e76f791192fcfe11e897146203d5acf536b9721e67 SHA512 50626367364cf0cb33658f6cbb99675f1191ed3e7ad447bd7d2c24f360bd3524ebe1b2d1fcc7d78d1a0692408da8d95795b54efee91a87c55e8b54711a968790
+DIST bytemuck-1.13.0.crate 41703 BLAKE2B f24b786d2209921f2de16209d3b397fa1d62f637efd8f0a92c6d7d3734fa447ae3f1c5499e85a16e30e39bd132c00c59517ae0886d1fab8da4aaf2150a3fc0d2 SHA512 e2e8164c9b14d8ec44879f3efb91f3ac3918e092d22d73152166b926c8b85e854c7b925b53feb173b572e9260100d9c584dbb80a377944b2415d485dd1d20876
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
+DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
 DIST crossbeam-channel-0.5.6.crate 90292 BLAKE2B 7da87ab15c384754d2493dd1a30e83550cd4b2b749b7f0c24de131f054e3a2e521e1bb4ba10094378c8f4c7bdf19218e35b10562c50b4ad1d2871bf6f821e488 SHA512 de6a42ffede95750a13e3b9af6ab26cbc498125860cd8e4d227c7361bd831e558254a48bdef5cf901585a915003071b0efa321f2011f282218c364780f62f44a
 DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B f00948fe90806fcbf1585c0404250dc84bca2cf27733bf7f2a0aa957e618f916162f41124333329a5b1e84909cbae3d93fb3b4461ab23e9dd97672c7d520d5b7 SHA512 a50a878d843d6eb1b5b92321ce6bfb87a23d3c16e820b1ff55472f0bd3d29b41d09ea95e1b9ccb2790f6687c043dd9ada1cd5124705e24292ccbd8fae1f243b3
 DIST crossbeam-epoch-0.9.10.crate 46918 BLAKE2B 86f33064dde615408435cd4cd8ffc878ccd7aca997440eb85705aaf71209288f2d7cd4a8a2ee8261d30d5d4e10addad1852ecce32826850fbca883430f4f0e26 SHA512 c8e103daf27a06798e4cc89c6263c08117ba7cef322421b7f91e6a96137c2fa2371ce9cf31e8d1a752be85f4feea90d4da21f1921a0a0c618c1f66ef67a5bf03
+DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555 SHA512 a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf
 DIST crossbeam-utils-0.8.11.crate 40887 BLAKE2B 6cf3c4e28243515f06193ef746b18129f62832abde8153503571052f4965b38ce510b09d18e51e0f563bfc14818af13463d1e2d63716b98a91b55461f5186b25 SHA512 eeb19480ca1860953507606f6649756974f65a05883c695fa371ff6d80a9fd0b94872aad5168955b4771b38f50314364236cb39363bcafe9750b687ff92a5ed5
+DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
 DIST either-1.8.0.crate 15992 BLAKE2B 5b9254d54ced1f23447cc78fca74f12085c37e3c2da441b30521819025ebb808e8cbd9cbcec811f8b3951030914c1736b8bda61744d1323af8c5b8b0a3ef3ee9 SHA512 5089b218af067b51ee39c085568a1a6f542e8f68b362207bd7126cbcd2b76783cd21cc1517a1d088ce4dad1714be03a3660f50e9498a0bb43a8676cd7ec490d2
+DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e
 DIST fallible_collections-0.4.5.crate 49236 BLAKE2B 1fcb36eb50e42e9d03823c8bb1a7b7d19dd40dbb7db632c44d079bf3755d72d2ce65007680fcdafab79a130df5ccb6c7471ffbf40bb39d3bda9557f4f897dea8 SHA512 4b59dcad7419b69d209a04f28a4ca19ca57c7e26642c13a932a310feb5d8171c17363ff15edb0ec03be8a5da3114f7e30dddba1721dd8db57945086ca5966906
+DIST fallible_collections-0.4.6.crate 49282 BLAKE2B 2f86f7de3c519db073157f13586394556c0c20a311677b110ba0858f87fd8daa9338b8217659325257fb2bec41b83c018671e074e2f53ef0d9607b49f1e00752 SHA512 0878e2c9ca4d7407fb7a77f7554d1fdb1ba1a42eb64905d35bd8966dd8aac0937da84bd1b84f03a1ab8a237447b439148d03595f23961f5648acc328fb7adf5c
 DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
+DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
 DIST getrandom-0.2.7.crate 28854 BLAKE2B 30c054361c9b1d9f95bc505e27e98d8cbb685f37c91437948d9d26f22028e0797a7c704d88912c1648b3704bfe10623a8c5e130e81746c8f85848b831771db80 SHA512 01803e609848662ad8650cf451dfc2c37580da0b7b5e0d4cc764da6ded253cf49ae42a433b1c53e89773bde00c1ccc136394e58ed4548e7b5c0ca7e202e857e1
+DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
 DIST libc-0.2.132.crate 595317 BLAKE2B 1b1ae80e034d94468befcafd4bae4c41f29424cbf3770b827dd1d7099cd2364db62cf2e7343da5010e230a47fbd91d320b162f7b54fa3955fd195b6976c3fb45 SHA512 48340dd173ed4d487f6504f4c32cb3c13dac8ad4da95469c8dd79386a7564d258a9ca42ccf1b174154717bafc1d3551b87c8fe35f7e4e062c8e33da9259fec50
+DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8
 DIST libimagequant-2.17.0.tar.gz 99343 BLAKE2B 3ffbd60fe438c1b9e604fb74e839cad2aab5fd771f9250f7594a2d6cbc1e1a8a68d46c726298a66ba15a3e40254a36067dd18023ef22c132bd827c319161a6fe SHA512 12b111f8293c0e37bd75481457b6c96b547a1e3bc1d33bc7a6bbbde6ada284d835c7f5958ef41af7a5a8d3e6fb2d1aa2f641b7d6f2fe2782202f3c760792f394
+DIST libimagequant-2.18.0.tar.gz 382092 BLAKE2B d1531dc01d06153c56434b7afda6cb4ce9f68de31a31d5db8afdf9f54c2da693bbe9b421bd316e37936da4c7d5dea45b1593644b452adf90c986c1d16f8ee1bd SHA512 ff2d4c2b901108525f403567ed2cc81dcda6e3600c58661de6324abb191ec04d954987e23b9c4d0e02cbec64ab905d717e3a0e1aecc6e1399ecc6126e889a356
 DIST libimagequant-4.0.4.tar.gz 85226 BLAKE2B 5b17388c51241724711957ec03673931ba72c6ae22c1e45bd623f5f775a7b4b8ae75a23cdabdb4dea27d03eea8803cd84b6640652fd310dc0a79d3090f25ef0c SHA512 a8bf4eb260256ad154ffea283f63877bdc14a01daba29725f44beb1d26c4c11de9927546aa2dde86716fdde74009ef38929ab68bae40f53cef01c929d8d7f82c
+DIST libimagequant-4.1.0.tar.gz 86121 BLAKE2B af7bd88443be346716583a1a4bdce9b15e7ec995664e2f5f8fae31f47247756ec152b42c776e020311d88bc9be0af8f081841e96aef37f1226219b189716a4a1 SHA512 16b6683b6e963b33fb8bc91f653a1129e44efd644c76cf88d1a85e59627c30b6135f550255d6883958aae49951961967af1b84c95b51fb9a2c2f1181c9ba3008
 DIST lodepng-3.7.0.crate 47225 BLAKE2B a480dfdf42a0de7bb22e80fe652ed53aa92504a0c2d0b982bb7f625577ca632c7102bd731c6b42425e2ce44ca25d0aa51056a1537c006686a344dfc2f09747f4 SHA512 10688fe1ee6d906fa7679f6ea56ae71b5112fb7dc480cb562d626948df807646f0efe9fa21495c8a756d17aad321f95695808c5836cd91bb161d2716f6d5ed45
+DIST lodepng-3.7.2.crate 48504 BLAKE2B d1a79e8f0540152d031971f368316d791e85dddb05f789cdcc4b1d1b49bc07e881baaf74e041979d26f63b527b9664a3942e8b280be6327f487882cc363078ee SHA512 f8a9a7e9d7583881c933404dbabc341943485131b25dd778f235a89f27ae1d613ce5b45d825f546ea1919b3599f80641f8479a216c801da27d2feddd59e8847c
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
+DIST memoffset-0.7.1.crate 8556 BLAKE2B 1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3 SHA512 40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST miniz_oxide-0.5.3.crate 53452 BLAKE2B ae99baa01c493b5eb779595be0d77a064c4624397676d3a023cc2a54941b0b3e7c80492ac47c8a28d78ec36e2f04aebe5af79f0e714380061c5e0139b9dfd9fb SHA512 cc2971ee2a2e891cdb05c1942f533b11a557199421910266ec2e4848a16dfe6882f1c08843035443935d695882720402356b4df4a50ed131a8f5fcc0591a72c5
+DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
 DIST noisy_float-0.2.0.crate 15564 BLAKE2B 12708b3af27234d16447ec2ac882ae0b8d31d01d9b25165206a1c289d0d5b514f659c380ca73ab08f6e236e62e844c70fc51fc0e3e7a629749e98e6ad09fc388 SHA512 98e7914d37e9c170753e999e349eb50603c4df5f9abc0c9803c150604e05848be24af318ca0370cc4902250aad2641b1393f2e75da15bf581737e44d3719cd38
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
+DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
 DIST once_cell-1.13.1.crate 31335 BLAKE2B f8455c5aa78073289669b8f277490ac9bfeafca3249bd54af91a51709262562f07e3154287f7a7db1711d0884fa2804aa82df5d7efb90b8ce5b2380c851be23c SHA512 492831607d12846923107b464a70de62f5997845faaae1625f3e54e2610e96b0355ce9e554051c2fae28f7e6e558ed456a6fc0b3c6a71b26f7443ede5eff5b32
+DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
 DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
+DIST rayon-1.6.1.crate 166330 BLAKE2B 5bbc439e0c88780b8d80cb36d4b4164e698a1189bd140e8c84d9f6a466023de0cd69a1f24c4217d595ae9af1f61aca6829461648152116c6bebeef0f0e686e50 SHA512 2e03585170e59f4388359817d67a43cd10a2244382615ae39bf84210db03a6dfec3b75d8a23800b8faaa31f45e8df4c44fbc343f02e18dd3dc0572c207791e73
+DIST rayon-core-1.10.2.crate 70599 BLAKE2B 3ef458725d2df280b259da4cef179f795dd8c29fc1b9fef06c9f405e3818508f2abe3d0eef206c14c6e1222f9271033cd3f534c3a11d2815e06abae31ce36874 SHA512 2b94669689b3c354fb65d2530c7da88d9d8d8a31cb7ad100e526018864f23091ffc976f0239e2614a521d58df3dece355b636ca06d0484ab4f0c3afca660dd24
 DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST rgb-0.8.33.crate 16261 BLAKE2B 208e85e812051fec9a12a6c37edf1c4e2442fb283f49858dcf2c154272bf274eee2492e8349cdd64d0cb2cd9d13bd2e8513f447b1e95f193c1e861b43c316438 SHA512 e9f8ac0eb598e1b917604d2fd9ea14bbef65345397d88296583f7ae0e5b3e231cf8fcc592ad1d7a402d96b8e478c0e9e872ab36cb8ab4e2239469d227dd05fbf
+DIST rgb-0.8.34.crate 16285 BLAKE2B 529d179db7b35948369eae985821cb943498c496a562c04faff62111de64b885fbdd30e299248314667484c6a76e2f62447779ea9531ccc33411a623370fad43 SHA512 2db90ed5e9fe4c28cddb1aba55daaaba01be93885815fd618cdb970df6c5a5c1ebd6af8550594ae57436df1ef631b1d6742e3f2309d665ef486b9c0d07f61da0
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 EBUILD libimagequant-2.15.1.ebuild 1385 BLAKE2B 1e9d7df57ee9f12f5395d07e2e0c6745f15f4193a83eef8f218c9057224115731794ca0af0b34e4b92f12450782138bb3b48e2f7d58a370491b82e93cf2579cf SHA512 27b825109537b992270c4938a8a9fbae16e4e1aba57110307f7320c5c2330ef247b25e1afe5965800b67543471fe86e62626f5522698347479ec14e3aeb62a68
-EBUILD libimagequant-2.17.0.ebuild 1386 BLAKE2B 0bf0eb56bb15db2b27bddf89dd64eb173961b66907abedcd5b730c263ee58d79e1e791262e2aa8636ead2db3e0570c9992de7e2dcaa5e3574307599b50e4d64a SHA512 9670c31a098d6991dcae5269a89d96741d247e345561cb76df8e2040f0f6ab1d0ad08896706f02098da685c4b8ff90f13f90af6ae763855185f635ac103cc31d
+EBUILD libimagequant-2.17.0.ebuild 1385 BLAKE2B f286c1e73acec4ec45c45da09fa4a45b70ff76f5090e490180a757c933acc998ef92064aa01cea1e8630e5cf2e216c2ec9e7577888912eaf4188fe78caff8e4e SHA512 beb4f2736ea3faa92c4f8f36eb752e31391f27e794ea1e0b92b3cefe7858bd60600df5d5d644f0bb6bbcee150c3ddaca703fb38aad65379fe70bad555f0aaf30
+EBUILD libimagequant-2.18.0.ebuild 1393 BLAKE2B 8434c65a1e9fa9b4d65d4eba4b77ef1e994ef470cf3fd2f5043378c0de5ff6e91b0816f77f3b243011b451f5bb527665bd41217dadea77fa2a7ffed72fa11f42 SHA512 1053d62c71cc01b5755f529253ae562bbad2d30733338f45e62f89124dc4334cef5b583ab3d73f48ecb1f05b2377b1e29c35f044fe328b990492af72a5c0c840
 EBUILD libimagequant-4.0.4.ebuild 1591 BLAKE2B e2f238a47fc09ec5f39de9ebdfee2a19a33c797a6d128a1ddf869e1067c0cbec2a625a04961fdc79ae96ab003935c9f7e8f522dfd2c68cd3be89c5dd8d53c208 SHA512 0e3d5bcf3e8bd85956c219350f96e1b50bc866410c16a0fdc8d2875467b22292e51b598cb886b101410f8e25da9c8d6e2d1eabc61beac791fb3439f641053471
+EBUILD libimagequant-4.1.0.ebuild 1563 BLAKE2B 20b4953379b9722f01a81905f4e52a52c34986319bcec10927f88467d876e36c8ac3ef4e667863abd3c0f29fcf3becf5cd4ef241776969128feca131fad0b78f SHA512 8104b7cf99b4118aa81896ebf83ea8603207a5248f02c8a402b735f73c93fb4542dd2b97b0597f667c91a78bb1eada2960c8c44657c52d26bb5d3ce0fb0f2697
 MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
index bdda64472b23..6d059018082b 100644
--- a/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
diff --git a/media-gfx/libimagequant/libimagequant-2.18.0.ebuild b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
new file mode 100644
index 000000000000..5bba4b9dff92
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.18.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 openmp"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.15.1-fix-pkgconfig.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# Avoid always building static library
+	# (Fixes side-effect of compiling in src_install too)
+	sed -i \
+		-e '/install.*STATICLIB/d' \
+		-e 's/all: static shared/all: shared/' \
+		Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC
+
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	emake shared imagequant.pc
+}
diff --git a/media-gfx/libimagequant/libimagequant-4.1.0.ebuild b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild
new file mode 100644
index 000000000000..7de965b89a1d
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-4.1.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+ahash-0.7.6
+arrayvec-0.7.2
+autocfg-1.1.0
+bitflags-1.3.2
+bytemuck-1.13.0
+cc-1.0.79
+cfg-if-1.0.0
+crc32fast-1.3.2
+crossbeam-channel-0.5.6
+crossbeam-deque-0.8.2
+crossbeam-epoch-0.9.13
+crossbeam-utils-0.8.14
+either-1.8.1
+fallible_collections-0.4.6
+flate2-1.0.25
+getrandom-0.2.8
+hashbrown-0.12.3
+hermit-abi-0.2.6
+libc-0.2.139
+lodepng-3.7.2
+memoffset-0.7.1
+miniz_oxide-0.6.2
+noisy_float-0.2.0
+num_cpus-1.15.0
+num-traits-0.2.15
+once_cell-1.17.0
+rayon-1.6.1
+rayon-core-1.10.2
+rgb-0.8.34
+scopeguard-1.1.0
+thread_local-1.1.4
+version_check-0.9.4
+wasi-0.11.0+wasi-snapshot-preview1
+"
+
+inherit cargo
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris)"
+S="${WORKDIR}"/${P}/imagequant-sys
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc"
+
+BDEPEND="
+	>=dev-util/cargo-c-0.9.11
+	>=virtual/rust-1.60
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*"
+
+src_compile() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix=/usr
+		--libdir="/usr/$(get_libdir)"
+	)
+
+	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
+}
+
+src_install() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix=/usr
+		--libdir="/usr/$(get_libdir)"
+		--destdir="${ED}"
+	)
+
+	cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed"
+}
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index f3e004a02690..6fbdcb4e8018 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -2,6 +2,8 @@ AUX pngquant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f9
 AUX pngquant-2.17.0-fix-test-version.patch 388 BLAKE2B 1b1543b9431f56fc9135147ed8317a5c2fe2cf378f1af0b1a0a8e706fab1933e8cfe150177a63a032387632337baf2b7a9a340245ffa3109962d8bc9d9908ea7 SHA512 dbc386e9ca1975dd1167e3e077dfbbc94432452f192802614ff0d9f77f17f0730314c28fef1baed01a9255a4afbfbfecdc450f4c9d07578cc1d424db34cb2d13
 DIST pngquant-2.12.6.tar.gz 69074 BLAKE2B 3573d54d94b0085de9ffd4dd34a8fd46c49a1e02d0a6419271c17bc7ac7ab6c05d811336a3a8a8ab21d4dea774c93ee1baae141b42c255838fb1eef9cdb1a871 SHA512 8ffff346df67edf1000c71b6d26371826bc4d236b3f57ef1ec73b3b61668cff9c3ca7d541417c39bc6c89e00176c91eb28867b7a91945ac84292ca0ac54984e9
 DIST pngquant-2.17.0.tar.gz 71209 BLAKE2B 0f625b6c27bc621fd5e1d9b4c5d3cbb7eda960a7afa8e6c6813c5d74e6f48055572dfacfcc93c694dc2d3fd8a107064c2a24c0845fc5339c0289b8527056d39a SHA512 7054cb6bdc547a6e00be1ab2363e2fa5367598593359ef23a91f3af8ff210b281e10f8721bc74d86f208f45336cd61292946c17dc5f26d292998eba95978dc0b
+DIST pngquant-2.18.0.tar.gz 71187 BLAKE2B 3b390908de8484748a136d68f1096d58b6e454138afe6b2f76692acff324830a8246cb7001ffc932b2acdd66732c42d72c898a5a355e4e4b9effc90cd6ed924a SHA512 d9531008c6909cbabd98eb17108baf3085903c22f79548012d9a6c5b1b973329f89739f11a45aa52e12041e8352315af6313ed04339b3db78f2be430a3ae2326
 EBUILD pngquant-2.12.6.ebuild 1488 BLAKE2B bdd86897fe7715fba56857380e2c97d9a80dbbbc98461ffd7c9f3021269b2ee6ff814262af7abca121cf288c8bd62ee2cde6bd4b11b91c1a893e88c45a3a02de SHA512 025a85d645fc680236a456286cc1c6e336679f05972d1fec8caf5adb55d2f39b779e6b0f1ad07564d0a19a2f643949ec10b09927fac7555cd99296a874ec7f9c
 EBUILD pngquant-2.17.0.ebuild 1547 BLAKE2B 33b3b503ac7c94bc95ad0c056df106c8b06975b5dae7ab5614a5c8ae9393d1e1d5d89e02ba050ddebf9ed5598eab0f1adab46881a26d86c09c00d3a455fd10b8 SHA512 c7d50b9e5252b92d987294e999cdc3f580d7d5cadbc0fc1054b7d72781648ecc6d980d83a115e5679b093b8632fa23a2e84bd19fdb7dbe25292a7e9e7be13aad
-MISC metadata.xml 261 BLAKE2B e57c0c3e4a59fdb630d23ae9d96afed10307c5308bace0cf58c22f41cbbf22fc82c5cd0d041800498570b1490a39f6c47547acfbb2766e21735820ae1c39bf8f SHA512 212dbdf6e688804621cd0ee28e47d3b9696182fe4850a87569e0727e5e811b7c4193807c2ecec65005e1689d4c0ba2c88fb67b29cc89928649e23d23a94d724b
+EBUILD pngquant-2.18.0.ebuild 1547 BLAKE2B 944e433f7498b56421f5ee3cd00bd43d41572f2bd85cf844240cb349908d7d1f6fc487b317b68006fbf5451d0202efd68f46bee27b75a799f742a24cf72c6a28 SHA512 6295c92563256a0be44892891e8512055f0fdb12445bb91d7ad8b782626e4212621e2cc2dcda430184268e2af0bd70cb2ed663757eb43784e46a34548447fc01
+MISC metadata.xml 348 BLAKE2B 75c2a5c4166647a20ee98f2ac89b34ff504cb2bfc507ae012a5f932cd5ea711492acae8ea6d9f24af0a6305e51a2fe835dc91eab8be5d0c5d4cf5bc7a901029f SHA512 00be8ad0504e426c0a076f50d6573b0f878563444b2bb2b6c8759e1fdb947a2b479599ac69b2640f537802106d098fbb50de57e1637fcf0f28d9ef375993a486
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 71a5bee94e5a..edc30d130730 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -5,4 +5,7 @@
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Huettel</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">kornelski/pngquant</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/pngquant/pngquant-2.18.0.ebuild b/media-gfx/pngquant/pngquant-2.18.0.ebuild
new file mode 100644
index 000000000000..ae8a0c8e0e3b
--- /dev/null
+++ b/media-gfx/pngquant/pngquant-2.18.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Command-line utility and library for lossy compression of PNG images"
+HOMEPAGE="https://pngquant.org/ https://github.com/kornelski/pngquant"
+SRC_URI="https://github.com/kornelski/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 HPND rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+IUSE="cpu_flags_x86_sse2 debug lcms openmp test"
+REQUIRED_USE="test? ( lcms )"
+
+RDEPEND="
+	media-libs/libpng:=
+	media-gfx/libimagequant:=
+	sys-libs/zlib:=
+	lcms? ( media-libs/lcms:2 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.17.0-fix-test-version.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	# avoid silent fallback to bundled lib
+	rm -rv lib || die
+}
+
+src_configure() {
+	tc-export AR CC
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
+		$(use debug && echo --enable-debug) \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use openmp && echo --with-openmp) \
+		$(use_with lcms lcms2) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc CHANGELOG README.md
+}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 7858878f111c..b447a17ee4f4 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/hdx-realtime-media-engine/Manifest b/media-plugins/hdx-realtime-media-engine/Manifest
index 1573f5fcbf19..1a786e631961 100644
--- a/media-plugins/hdx-realtime-media-engine/Manifest
+++ b/media-plugins/hdx-realtime-media-engine/Manifest
@@ -3,6 +3,6 @@ DIST HDX_RealTime_Media_Engine_2.9.400_for_Linux_x64.zip 30137698 BLAKE2B 87819d
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux.zip 30099634 BLAKE2B aee56c8f2e909ebdeba751ec45a74f7e0a350c7d3ecca0f815f5da5693d3b0941e07cd7bcfdc4d86cbae97668b6252e308e30d57d08494b7ff47ad4e302a8494 SHA512 bfc1949dd8a2774fa0e3228c75523d26d6f28f39e2936b5152567f52a39dc853569a4a012c7e49fa72dd7e75262f0a615bad872191be155ca9c6920bf56ae888
 DIST HDX_RealTime_Media_Engine_2.9.500_for_Linux_x64.zip 30138987 BLAKE2B f59c7cac53c7fdf9560ef7f31ade2e3439c8fa54e46cfb8ad86e4b8bc8880073e73cce5f4cafd2d009ec8bae688d41c8bc8f7d26cf2b89665c2414b87aa0bd6c SHA512 8d9bd9ac2414472d80f04025f0966e32f4157ecd6757c9361c46a2a5d077a3913b93cf5f91f175a239dc4e85363f65a6c855c637a5bce2b3d71775ef66fa345d
 EBUILD hdx-realtime-media-engine-2.9.400.2702.ebuild 2130 BLAKE2B 1e17055a2c2ba161f73e7f65eebd62a694299eb6e51ceefd5600d47502fcde8a7da9b6a2654c5743941c1b830b52ad70abcda4fa2cc7754e80bc59c5856e051a SHA512 14960573234eaaa8fe423544d0e6fa17721281384231ebf6b5ca5407eaf66b8709794671398983a19e6f010c5362c825db89d5e7c38b7d8b9a5d1594cb6eeba3
-EBUILD hdx-realtime-media-engine-2.9.500.2802-r1.ebuild 1864 BLAKE2B 3ed6bd55ef25023ba695048d70625741f62df27d21ec3b74f044a71f275c44dd25199e423b09bfdef1dda539fdceec61dbf8211900c9710f7e91c3d608ef129a SHA512 efc019cafcf4d323f374cfe1425b324613c8bcbed61a9757d53c8c3f01ef039b8cdeb8c10c797ff3af1222f7018076c5b5bee1643bc4d22fdd54cf24dfc1d4d8
+EBUILD hdx-realtime-media-engine-2.9.500.2802-r1.ebuild 1862 BLAKE2B 6d6dfe59c2d6da52ea8e07fcd85ed69620353a8f16ae05494e207cf7ebd00a95e421bbff54a3bb119b021922f7649b5e4f2b232fbb62516deebd1bba382650c2 SHA512 02d426d61a3c19428c701377aa5c50eaab3e942fbc40d9f012b32fb2dff71bc2b671779455f66911e4e38bf0f3b4c14e0fda2514e76da89d1f7f9e6f1e481851
 EBUILD hdx-realtime-media-engine-2.9.500.2802.ebuild 2130 BLAKE2B 53655eeb4da806fe632c87612673e3c6b62e1a4bc406a0b406172892b0170de96e3b9dcc7ca65883cea3c9f47adf15b78074896e745a298fe886a99ed6e57f01 SHA512 65fda2116bedfcf63210f3db16296798cf23587d3bce13670ac4daa626edd6b69c4537592f1d345fc23bc5cb01e69f8da63a8ee4f4a2db48d2f20fb661a47ef7
 MISC metadata.xml 396 BLAKE2B 87022ff667ea4915aaeb6bd69234d79f1030f0501ba2c6cbca8068905639f7797765b6b165a0cb5663f63f7d6089b73528745a3e3f413a02a023f66696f0ceb0 SHA512 8b03761bc34e251e177c940e1e61b0d7faba8651d7cc4f3971fe7928adbd9a3d7c4041474d404d966a5a0818066f0d64ce3c8b7f7fedebfed2132d338625b09d
diff --git a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild
index 44b4204ecde3..7a2485f564ce 100644
--- a/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild
+++ b/media-plugins/hdx-realtime-media-engine/hdx-realtime-media-engine-2.9.500.2802-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( HDX_RealTime_Media_Engine_${MY_PV}_for_Linux_x64.zip )
 LICENSE="icaclient"
 SLOT="0"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="fetch mirror strip"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 89e6cfe36ad2..0ddbe76dfd20 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index d6d8dd29b3be..6b7eff122906 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,15 +1,15 @@
 DIST asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz 1211725 BLAKE2B 8ffe536e9398b23910deab9889136ac5cb2a39e26982826252400737ea68d201e11bf16f13f20bd4c777fc7ff718da5ef8d329747065c62e61306fc1448f3908 SHA512 91245741fe6e7ce8eec6897f222b05cfa9474f93487272d8ca84ec56679afd5cddff2cf07f30cdd6516149e0a138b8a7396b1a7c02a46044b38f4e60addcbf8a
 DIST cef_binary_5060_linux64.tar.bz2 132839531 BLAKE2B f7d342cf12bf435aab3873b666a47c42c6583a88f140c28dabfd2dd860cd0d5c96cc51cc034703bffc6f1094a738bd77008c01839fa5ea53b848bc1c483a0ae4 SHA512 c99ce53858c57becd7822e39ff81d59b7296374fa61b29dfd4a572c2ed8f9ab155114ed179764ea05586e0edb2f1654f0b73c471f1cd9b233660e7f1c8b462c4
 DIST json-a34e011e24beece3b69397a03fdc650546f052c3.tar.gz 6860722 BLAKE2B 433b499f24859153171654f3fd0fa9afd4ceb8b21a159185a424084b940d8496f8952c0291a52d85009dde16c46e45d5a206f354d043f4d010a29a1f18965d87 SHA512 a7c64517377274479bc3060163a2a7ed0a8780c12dc193287c060f04dfd742ffe8832c930bec75eb0b36f8290044c31530260a614aabae90367f6ccfd4b711f3
+DIST obs-browser-1c2264d722f065646b72ac654f6ddbb6843f9bef.tar.gz 110765 BLAKE2B 99ceb51dc1a39c5abab26c6e5f1be63eb0cfaeb7e102ed07a4dc6a16d477e46e7499f1e9beca81d479683374d03e3c08c9ceeb34d04a733ae34c0688bb4ad1c0 SHA512 bddfa7914559405331c10a9589f46c17013cdbd361423e71763a4d8d4d521c53dc5df4d7581ff7bf0c9136627024e017bfb08b4a996b33e609cddbae41b5c878
 DIST obs-browser-e2310b02df3e6c184fe6eb6608244a82e37f582e.tar.gz 109012 BLAKE2B a2f3d9e1a3dbc3aa4d00423e743633038d59ce501626941a21ef0cf78608f4190335b8b846bfef49b2f09976d4ef3bb8b19f955b2a328c375cc045b886cb367c SHA512 76494fc9415db68d2b67d832a7a5c8b035e4e379d9adb6eb8292579d12b88b92350692b24e999b1328e02f729fae4060304594d37c754ff359903193c1464aed
-DIST obs-browser-fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz 109571 BLAKE2B 10082c64bd872d52fccf7bd539f7106c5b66fc9d6e5f31ffdb86c2e6a3e97b36a4848f5f6f008cbfb67f94bd1fad01c7683e8575e3e0f8d1808724e740be4e11 SHA512 113f97a21be8deb8bbd1ec98fd565ebb139d4b6901692ed5f61034581da7016b06fa6975b49db3fd2c7aaeac369a09ac98174798abba149aacbfffd2e0b40236
 DIST obs-studio-28.1.2.tar.gz 18859931 BLAKE2B 08fcedb4094d6a03512139e9055116f47fbd6cf706029d2719524bc018d0dce2a774de83b603f9a7665a115e2414775b858020e0be0ccdcc6882478256392646 SHA512 9d5e7e1f2f6236b795c2c49a1a6ba43623c71f16c1c6106fae6ac99b792e15793c169fb62aea271c253b13a0fd9bc9b9ad7880315d9ee787682174a5700f85bd
-DIST obs-studio-29.0.0.tar.gz 18894364 BLAKE2B 3cf120b5bc9bae3d797a55aa0d348a6eabb2c0ccbf71d89e203468c42780212a6ad0ab52eaa913a8942a4b9c1bf07a50dc951891bcf2cbc3639177f983841066 SHA512 14208682fd7c2d5bdc049affe9adcdda73f5d9177277da021aed942518f23c2f3bec8ed55ba58fd8ee3f5f575b13f1083b36248a1073bafed2c4bbb2bd28ec61
+DIST obs-studio-29.0.2.tar.gz 18939072 BLAKE2B 78a6b7fec520797a5c9d36e7d9a034c29c701d38a745415c3fd0ae3907831584ef4a77b833fa1a7466a23b02a06736afd34720ff3b0d3226dbb0dcab64c72931 SHA512 63a832dc6a0a7f07a2f7adf18f1412e8694405d39721144e82dedab8182e17da6f3063f547bc2b33cc7ea053f6dbb8ffda051af5bffdf9773710bd08744faf8f
 DIST obs-websocket-31f9845b6132e6c1529401292bc1125401e2a324.tar.gz 238884 BLAKE2B 93a41ff9dd33cf2babaef90c961def1ae39d3b4e7d2f2542123973672c2adbd0cff987f58ce72e9c4acd8818c834531e624c376b3d297f4bdfc097e22ee4b293 SHA512 11bf28f574ec2a7b128dae53010484610465c94245881fd98eb750b59e00236f656d1ef706187a41cb42eab3e3668440d83f66399f6917e2d93b7ba6c7241ad3
 DIST obs-websocket-5716577019b1ccda01a12db2cba35a023082b7ad.tar.gz 235118 BLAKE2B 96202cf81389b82b26027680dcaa6e2bf902c9776a89895fbef859dae2986523bc5d34ad30233c29fac043611a942fb4d86e5d9d9cd4ef2a9503154a383002fe SHA512 9bb511c9693889f9837cd001fafe403762d44f2ecc80bad42e592d7555e3807a148ab19638724871b7807e71edf5f62a1e0ea62f362fd1b9a6e9bf49000b8a5c
 DIST qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz 135863 BLAKE2B fa6fb9c9e5250b56bdf38f31aa4acaf4ce860c153012984d1266928bd7a62dcf43b271ff53b4322931304670742566dcb016ef65ff2f681bf76224f86eca567c SHA512 ba298de89411fecc8db3dc10850485da01f5183d68b6d91ea91a9e28c1f104eb110adbf143a37e5d1856abbba5d309ab8329a6359ca7225bacb033d8044fa72c
 DIST websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz 701544 BLAKE2B 61680c31309d8f78b27b82e1bde2c7828eae2777df0629355c557dfd8b0daef6de7d202bbcff372351e135bb62366ffc8eec6c72a99df7c46a9197773c46550c SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163
 EBUILD obs-studio-28.1.2-r1.ebuild 7193 BLAKE2B 134261984fe071031a465caee01f3622549003bbe60f32715dafffba3943b2746e659391991d452ad652ba24613eb12feadea6554fd14cc9e2c050e10e8e94b7 SHA512 bebd32725f9cc9de517c3c791ca6644aab7810a2cd4ef2a85298b59c80f6eb37df548ed34196ff2ddece23aa1c7e7f4b4b516d5d7b9616210cf394fa9adda016
-EBUILD obs-studio-29.0.0-r1.ebuild 7211 BLAKE2B 13c6de88ae87fcb04772b610448f10aab8cedd56eef19a5fcf7347c7e21d41cc5791f65d8deaaa230bd81be20e0dab8a8db01faf8725e6b2da5fcd5b8818d0b2 SHA512 73c8d8f02e1b7d071767892ba7572c66e538fb24789de8e1ce0ed5f875c709b3c482a336087c1571750674f12d69c5b3cbd7b0a6f4d702d14229dbb7a732680d
+EBUILD obs-studio-29.0.2.ebuild 7211 BLAKE2B 61065d6cdd5108c12da200f101a797f35b89f97862cd37b888c1c7f8bf8986e0d447513a2884a2af0dc393c9cefaaec68005d0099e982f5b78ac2e7d5d6a8d4f SHA512 87922eddb86adc668a1952caae44a4ad404ae60811d83a717a6b161c45a428816a352c77101cff91d5c86605894c14a2ea19df08dcc058c0c1bd1b150639ecce
 EBUILD obs-studio-9999.ebuild 7211 BLAKE2B 61065d6cdd5108c12da200f101a797f35b89f97862cd37b888c1c7f8bf8986e0d447513a2884a2af0dc393c9cefaaec68005d0099e982f5b78ac2e7d5d6a8d4f SHA512 87922eddb86adc668a1952caae44a4ad404ae60811d83a717a6b161c45a428816a352c77101cff91d5c86605894c14a2ea19df08dcc058c0c1bd1b150639ecce
 MISC metadata.xml 1330 BLAKE2B 4df42f330b8a71cce033c42750434f1fdf9147bff19ee612c14be9187a9fd770b1e998d8f631c4e4da9eef7ffcb863f3a398883612cb2f7d49046529ad5e1f09 SHA512 dafece41c313bb983958c380e422f513af6d2716df90e87e74b85c604ce3ce896735fc618e5028289ff37b71d929ae623828de620e8b30fb2f8de84190a47dfd
diff --git a/media-video/obs-studio/obs-studio-29.0.0-r1.ebuild b/media-video/obs-studio/obs-studio-29.0.2.ebuild
index 70779f23ca4f..a7bffc5d998a 100644
--- a/media-video/obs-studio/obs-studio-29.0.0-r1.ebuild
+++ b/media-video/obs-studio/obs-studio-29.0.2.ebuild
@@ -12,7 +12,7 @@ inherit cmake lua-single optfeature python-single-r1 xdg
 CEF_DIR="cef_binary_5060_linux64"
 ASIO_COMMIT="b73dc1d2c0ecb9452a87c26544d7f71e24342df6"
 JSON_COMMIT="a34e011e24beece3b69397a03fdc650546f052c3"
-OBS_BROWSER_COMMIT="fc62563ba4232649b7e0ffd772e66ad71ba49377"
+OBS_BROWSER_COMMIT="1c2264d722f065646b72ac654f6ddbb6843f9bef"
 OBS_WEBSOCKET_COMMIT="31f9845b6132e6c1529401292bc1125401e2a324"
 QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 WEBSOCKETPP_COMMIT="56123c87598f8b1dd471be83ca841ceae07f95ba"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a98ae6857230..9b37bcc2d6a0 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b6db7fdbc6dc..1ddd348060e3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Feb 2023 02:39:36 +0000
+Mon, 06 Feb 2023 08:39:36 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 10c988c39a6a..76d560e51bf1 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-02-06T02:39:39Z
+TIMESTAMP 2023-02-06T08:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgaGtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgvMtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZtA/+MkTupsKpD8h88oG/OJ3FfK15RUfRS8ASFZcrICLVNyUNjChFHkoj8dMT
-za2nBziZ7ksBsnHS3RgAPNDGzfeCxXKBYe+c6mB59x0jmsMZ8ys6yiS61s/TlY2P
-Gp/69v5aePcQIc+w6ZnKqXOeu9109/NPv27XHKccPPiCAJf471Prmq2SCxztZysi
-QHrfNfCgaKql/XJXWcq7CgJVACAemRr4UKYpvzh9Lael7+sIZfMbjqCdZXtsmnit
-LWZJ8k4ujARFfngHnOR8HVt1GIRIO36SUW+uFcBQQgBcCTpGT1k+YnWDv8DnfG8d
-mKRCeQQJH8m6B/4Z9CKCbDkpYtr6F4AnnbeFkbICkOdDgOqF3pavpRYkVujbHXei
-i2wIPyYZcYO/qabwSMQ2PKE5Hs60qn3GcgtnSjYO1NHPxVXbbGRNb9z28IpeUoFL
-eOVup88yQa5YnpK5CWjBxfiA81d84k/TAOwzsRj8M0plxNMUHKnlx50NkYdYNTVb
-pJvFfXQGqEhlNxNrzniiY7w5mtA6BDumC2fzv+EV4ny3tzPnCQhN3hhfQceZhdza
-oXMHu1qLcMM4tMhjxGrBWiMpP+vWgt74C0kwJFmtiqUzRMFSTuZ4DWBVrS5JGBjp
-QAt/H06VKGGNX9PmRPJRDKgDak1b3q8HX1oqPkRdM68j6PF3aSM=
-=WBIj
+klCUsg//W0mm3wjW28jXoWUnb5Uqo4mQ4rG+uRxSLeVJDP+22/rmvnRWkcjKn2yE
+Qku6wtsawSZDpG8/Quhp+ijn4t+qbhXodsagVQqfwzQvOfZeQoX79cMrdAmv51Sx
+LId5tJ5GQIvI0oJxDHzn+Js5h3qPFzhv6mp1ZvDk9mBZJ6Ru+ki5EFjqwDZwGGP4
+WkWEzDkr/lh0s0nGZItTiQTXv5+LoQlKJBzagro1xFj4RTk1soMtPnMX8LpJJOSs
+hjAXmalHwNXnlS69kA84Z3RSHj8LM2f7KZP6YeipX9K7FaMwZaS/cJ6/f0wrcQZ+
+sBiuwwDe0fN3WZpsR3XTwYgwc9H/xPcd35AQYhBEqMbMZDhNISruJ4RUsMqxYEnh
++rK0uTonl3fUrRjJFNHKQHqHzmNMIQGlnDEzvQz79SOY8Zytm9tQh2Y0AYPfBR9D
+UQYdWAayTs/f/OQhLkMkqggjd/dKPPporA3Rblt4TSiF4lFZQPwyRpEiYg9IJEdu
+HknGFfhtfZ5f3pokPHrdB8aV4KP53bvM3+5FrdPzB0oi7zKd5xfJkfc8j4QprXVp
+NG5IcEFCzFYRqbE5DUYPasSx5ItZZKWvAcocLYZARWP6YhMguCXIn9S6J+XCbRZA
+DjBvc0pqosM5K2Iirduj/SkLvoWZoEgWta9o9qpRpP8THHUt/gk=
+=rwdZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 23afea5d57bc..1ddd348060e3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Feb 2023 02:39:37 +0000
+Mon, 06 Feb 2023 08:39:36 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4534fd505cd8..d99c78d9ab9c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 348e8ff047bb..efbd871ef1be 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/gnote-43.1 b/metadata/md5-cache/app-misc/gnote-43.1
new file mode 100644
index 000000000000..4f264cbc0ecb
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gnote-43.1
@@ -0,0 +1,17 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35.0 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.62:2[dbus] >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.22.20:3.0 >=app-crypt/libsecret-0.8 >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=app-text/gspell-1.6.0:= test? ( dev-libs/unittest++ )
+DESCRIPTION=Desktop note-taking application
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 meson readme.gentoo-r1
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3+ FDL-1.1
+RDEPEND=>=dev-libs/glib-2.62:2[dbus] >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.22.20:3.0 >=app-crypt/libsecret-0.8 >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=app-text/gspell-1.6.0:= test? ( dev-libs/unittest++ ) gnome-base/gsettings-desktop-schemas
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnote/43/gnote-43.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=c3576d5af4310a6cba49f32f3e4f03ce
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 82a50895a30c..3c426d685f8e 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.55 b/metadata/md5-cache/app-office/gnumeric-1.12.55
new file mode 100644
index 000000000000..e094374e80c6
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.55
@@ -0,0 +1,18 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.55:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+DESCRIPTION=The GNOME Spreadsheet
+EAPI=8
+HOMEPAGE=http://www.gnumeric.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome.org python-r1 xdg
+IUSE=+introspection libgda perl python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.55:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg(+)] introspection? ( python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=introspection? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.55.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=911882bca68368655659bf0cb8ff861d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3e512dfa9c28..44862637c9e6 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/lowdown-1.0.0 b/metadata/md5-cache/app-text/lowdown-1.0.0
new file mode 100644
index 000000000000..53848a5dcde8
--- /dev/null
+++ b/metadata/md5-cache/app-text/lowdown-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure test
+DEPEND=virtual/libcrypt:=
+DESCRIPTION=Markdown translator producing HTML5, roff documents in the ms and man formats
+EAPI=8
+HOMEPAGE=https://kristaps.bsd.lv/lowdown/
+INHERIT=toolchain-funcs flag-o-matic
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=ISC
+RDEPEND=virtual/libcrypt:=
+SLOT=0
+SRC_URI=https://github.com/kristapsdz/lowdown/archive/refs/tags/VERSION_1_0_0.tar.gz -> lowdown-1.0.0.tar.gz
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=19379022f0244ceb082d18a22a26c6d2
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 9ea3b79bdd04..d2a8d0e26b90 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.11-r1 b/metadata/md5-cache/dev-db/mariadb-10.6.11-r1
index 7bcc79ecbe46..a2cc26e24947 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.11-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.11-r1
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.11/source/mariadb-10.6.11.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4d402a88fd8ed29fcb0888e9a3ab814a
+_md5_=4ba3fc2c113beb0719c1ee20f71c2ce7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9558999fefb0..62582fcd863d 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.0 b/metadata/md5-cache/dev-python/bitarray-2.7.0
new file mode 100644
index 000000000000..0d11804e0455
--- /dev/null
+++ b/metadata/md5-cache/dev-python/bitarray-2.7.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient arrays of booleans -- C extension
+EAPI=8
+HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bitarray/bitarray-2.7.0.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=98d7de83844bb13d455c3ac8a5ce5195
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.67.1 b/metadata/md5-cache/dev-python/hypothesis-6.67.1
new file mode 100644
index 000000000000..a7e524e39839
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.67.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.67.1.tar.gz -> hypothesis-6.67.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.5-r1 b/metadata/md5-cache/dev-python/nbxmpp-3.2.5-r1
index 581303d8a0cd..d65c7d3bd686 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-3.2.5-r1
+++ b/metadata/md5-cache/dev-python/nbxmpp-3.2.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.2.5/python-nbxmpp-3.2.5.tar.bz2
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a3a69271cba40849831037f6bcbb14ba
+_md5_=c6feec07361a929c084543151534bf49
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-4.1.0 b/metadata/md5-cache/dev-python/nbxmpp-4.1.0
index 14aba0d0ed58..048b15434f33 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-4.1.0
+++ b/metadata/md5-cache/dev-python/nbxmpp-4.1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.1.0/python-nbxmpp-4.1.0.tar.bz2
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2fd9e49923376ae90030691cda47c6d8
+_md5_=b12c320eeb6a6a4534c44e5fc1015125
diff --git a/metadata/md5-cache/dev-python/nbxmpp-4.2.0 b/metadata/md5-cache/dev-python/nbxmpp-4.2.0
new file mode 100644
index 000000000000..ebd9035d2f5c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbxmpp-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/precis-i18n-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.42[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=8
+HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/precis-i18n-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.42[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.2.0/python-nbxmpp-4.2.0.tar.bz2
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=7dba4caa3768976608a30ec57ce45a91
diff --git a/metadata/md5-cache/dev-python/pycparser-2.21-r1 b/metadata/md5-cache/dev-python/pycparser-2.21-r1
index c47925976a70..71b6a642f5d7 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.21-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.21-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.21.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=2280e44c8bb149400a4dae66638b5435
+_md5_=657e85795f67890ce7791ab442f770a0
diff --git a/metadata/md5-cache/dev-python/pypdf-3.4.0 b/metadata/md5-cache/dev-python/pypdf-3.4.0
new file mode 100644
index 000000000000..975f0fbc0b6a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypdf-3.4.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/pillow[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pypdf/ https://github.com/py-pdf/pypdf/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+PROPERTIES=test_network
+RDEPEND=python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/py-pdf/pypdf/archive/3.4.0.tar.gz -> pypdf-3.4.0.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/0fe84b30ed33ff3daa9293e44349b8618f135699.tar.gz -> pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz )
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=9e23fda2e16dcf780db692840d3abd23
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-4.0.0-r1 b/metadata/md5-cache/dev-python/python-nbxmpp-4.0.0-r1
deleted file mode 100644
index f5a62c38b91e..000000000000
--- a/metadata/md5-cache/dev-python/python-nbxmpp-4.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/precis-i18n[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/precis-i18n[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.0.0/python-nbxmpp-4.0.0.tar.bz2
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ec3b02ad16b52fa95537bc7dd4e09880
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-4.0.1 b/metadata/md5-cache/dev-python/python-nbxmpp-4.0.1
deleted file mode 100644
index 3c6408c52ce0..000000000000
--- a/metadata/md5-cache/dev-python/python-nbxmpp-4.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/precis-i18n[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/precis-i18n[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.0.1/python-nbxmpp-4.0.1.tar.bz2
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=ec3b02ad16b52fa95537bc7dd4e09880
diff --git a/metadata/md5-cache/dev-python/qrcode-7.4.2 b/metadata/md5-cache/dev-python/qrcode-7.4.2
new file mode 100644
index 000000000000..8fb8abe1721c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qrcode-7.4.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypng[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=QR Code generator on top of PIL
+EAPI=8
+HOMEPAGE=https://github.com/lincolnloop/python-qrcode/ https://pypi.org/project/qrcode/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pypng[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/q/qrcode/qrcode-7.4.2.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=58180faf36d3bc4069db44a008cc414f
diff --git a/metadata/md5-cache/dev-python/simplejson-3.18.3 b/metadata/md5-cache/dev-python/simplejson-3.18.3
new file mode 100644
index 000000000000..7cd8ee0ca84c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.18.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=8
+HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
+INHERIT=distutils-r1
+IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/simplejson/simplejson/archive/v3.18.3.tar.gz -> simplejson-3.18.3.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=0c3568f08f12aea703c5c8687848c023
diff --git a/metadata/md5-cache/dev-python/zipp-3.12.1 b/metadata/md5-cache/dev-python/zipp-3.12.1
new file mode 100644
index 000000000000..02bc350c780a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zipp-3.12.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jaraco-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/zipp/ https://pypi.org/project/zipp/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+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=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zipp/zipp-3.12.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=7854f72135d3dd23398d03572deaceb5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index a3d9b8286eda..b9c69bdcb78e 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/gnome-builder-43.6 b/metadata/md5-cache/dev-util/gnome-builder-43.6
new file mode 100644
index 000000000000..2f460cd59e4d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-43.6
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 ) !!sys-devel/llvm:0
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+IUSE=clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/glib-2.73.3:2 >=gui-libs/gtk-4.7.1:4[introspection] >=gui-libs/libadwaita-1.2.0:1 >=gui-libs/libpanel-1.0.0:1 >=gui-libs/gtksourceview-5.5.2:5[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.42.0:= >=dev-libs/libpeas-1.34.0[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.36.0:=[introspection] >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) >=app-text/cmark-0.29.0:0= d-spy? ( >=dev-util/d-spy-1.4.0:1 ) app-text/editorconfig-core-c flatpak? ( dev-util/ostree >=net-libs/libsoup-3:3.0 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-1.1.0[ssh] ) >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) clang? ( sys-devel/clang:= ) spell? ( app-text/enchant:2 dev-libs/icu:= ) sysprof? ( >=dev-util/sysprof-capture-3.46.0:4 >=dev-util/sysprof-3.46.0:0/4 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) flatpak? ( git )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/43/gnome-builder-43.6.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ae86a6b31f2fb90136319fbfb2408ec
diff --git a/metadata/md5-cache/dev-util/hip-5.3.3-r2 b/metadata/md5-cache/dev-util/hip-5.3.3-r3
index 78420767591e..09319b1e16cf 100644
--- a/metadata/md5-cache/dev-util/hip-5.3.3-r2
+++ b/metadata/md5-cache/dev-util/hip-5.3.3-r3
@@ -12,4 +12,4 @@ RDEPEND=>=dev-util/rocminfo-5 sys-devel/clang:15 dev-libs/rocm-comgr:0/5.3 virtu
 SLOT=0/5.3
 SRC_URI=https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-5.3.3.tar.gz -> rocm-hipamd-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.3.3.tar.gz -> rocm-hip-5.3.3.tar.gz https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-5.3.3.tar.gz -> rocclr-5.3.3.tar.gz https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-5.3.3.tar.gz -> rocm-opencl-runtime-5.3.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	docs	314e509c51630fb75f120d62a77d008c	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=885417776c8390bca1899948561cac53
+_md5_=1aac638ad92deeb07eb66442e9ab4925
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 48b74ee25831..bafd6b0a2e3e 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.17.0 b/metadata/md5-cache/media-gfx/libimagequant-2.17.0
index cadbf1f51850..c47ef376d4d6 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.17.0
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.17.0
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://pngquant.org/lib/
 INHERIT=toolchain-funcs
 IUSE=cpu_flags_x86_sse2 openmp
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.17.0.tar.gz -> libimagequant-2.17.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=13b14a8f1f427ffaa70e4bae9edee184
+_md5_=330d88bd5b14a55f2bd332f4cb09419f
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.18.0 b/metadata/md5-cache/media-gfx/libimagequant-2.18.0
new file mode 100644
index 000000000000..a67c492ad709
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.18.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure prepare pretend setup
+DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
+EAPI=8
+HOMEPAGE=https://pngquant.org/lib/
+INHERIT=toolchain-funcs
+IUSE=cpu_flags_x86_sse2 openmp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+SLOT=0/0
+SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.18.0.tar.gz -> libimagequant-2.18.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=c770129ac73b49aece0c511647256421
diff --git a/metadata/md5-cache/media-gfx/libimagequant-4.1.0 b/metadata/md5-cache/media-gfx/libimagequant-4.1.0
new file mode 100644
index 000000000000..3ee29a23b5e9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/libimagequant-4.1.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/cargo-c-0.9.11 >=virtual/rust-1.60 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
+EAPI=8
+HOMEPAGE=https://pngquant.org/lib/
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc
+LICENSE=GPL-3
+SLOT=0/0
+SRC_URI=https://github.com/ImageOptim/libimagequant/archive/4.1.0.tar.gz -> libimagequant-4.1.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bytemuck/1.13.0/download -> bytemuck-1.13.0.crate https://crates.io/api/v1/crates/cc/1.0.79/download -> cc-1.0.79.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.6/download -> crossbeam-channel-0.5.6.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.2/download -> crossbeam-deque-0.8.2.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.13/download -> crossbeam-epoch-0.9.13.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/fallible_collections/0.4.6/download -> fallible_collections-0.4.6.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/lodepng/3.7.2/download -> lodepng-3.7.2.crate https://crates.io/api/v1/crates/memoffset/0.7.1/download -> memoffset-0.7.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/noisy_float/0.2.0/download -> noisy_float-0.2.0.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/rayon/1.6.1/download -> rayon-1.6.1.crate https://crates.io/api/v1/crates/rayon-core/1.10.2/download -> rayon-core-1.10.2.crate https://crates.io/api/v1/crates/rgb/0.8.34/download -> rgb-0.8.34.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate
+_eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=ba9748328da6f22003859e20232c71d4
diff --git a/metadata/md5-cache/media-gfx/pngquant-2.18.0 b/metadata/md5-cache/media-gfx/pngquant-2.18.0
new file mode 100644
index 000000000000..108ba982e7c1
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngquant-2.18.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare pretend setup
+DEPEND=media-libs/libpng:= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
+DESCRIPTION=Command-line utility and library for lossy compression of PNG images
+EAPI=8
+HOMEPAGE=https://pngquant.org/ https://github.com/kornelski/pngquant
+INHERIT=toolchain-funcs
+IUSE=cpu_flags_x86_sse2 debug lcms openmp test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3 HPND rwpng
+RDEPEND=media-libs/libpng:= media-gfx/libimagequant:= sys-libs/zlib:= lcms? ( media-libs/lcms:2 )
+REQUIRED_USE=test? ( lcms )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kornelski/pngquant/archive/2.18.0.tar.gz -> pngquant-2.18.0.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=ac52fb1de94cf4cf76cd93101d342f4b
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 02bee4addd06..e5f5efdee74b 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1
index 4f00c93a43ba..6a8e046b756d 100644
--- a/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1
+++ b/metadata/md5-cache/media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HDX RealTime Media Engine plugin for Citrix Workspace App
 EAPI=8
 HOMEPAGE=https://www.citrix.com/
 INHERIT=unpacker
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=icaclient
 RDEPEND=sys-libs/llvm-libunwind || ( media-video/pipewire media-sound/pulseaudio media-sound/apulse ) !<net-misc/icaclient-22.12.0.12
 RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=amd64? ( HDX_RealTime_Media_Engine_2.9.500_for_Linux_x64.zip ) x86? ( HDX_RealTime_Media_Engine_2.9.500_for_Linux.zip )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=56e5ec4ccc56b2fc2288934f8cafdfe4
+_md5_=a5f4ad3deb17022e48cabdefaef09b34
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index fa5e0b7fb034..cf008d738b00 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/obs-studio-29.0.0-r1 b/metadata/md5-cache/media-video/obs-studio-29.0.2
index 1e991b78c749..9d9c59c40b76 100644
--- a/metadata/md5-cache/media-video/obs-studio-29.0.0-r1
+++ b/metadata/md5-cache/media-video/obs-studio-29.0.2
@@ -12,6 +12,6 @@ LICENSE=Boost-1.0 GPL-2+ MIT Unlicense
 RDEPEND=dev-libs/glib:2 dev-libs/jansson:= media-libs/libglvnd media-libs/libva media-libs/x264:= media-video/ffmpeg:=[nvenc?,x264] net-misc/curl sys-apps/dbus sys-apps/pciutils sys-libs/zlib:= x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXfixes x11-libs/libxcb:= alsa? ( media-libs/alsa-lib ) browser? ( || ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups x11-libs/cairo x11-libs/libdrm x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libxshmfence x11-libs/libXtst x11-libs/pango ) fdk? ( media-libs/fdk-aac:= ) jack? ( virtual/jack ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) qt6? ( dev-qt/qtbase:6[network,widgets,xml(+)] dev-qt/qtsvg:6 x11-libs/libxkbcommon ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtgui:5[wayland?] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l virtual/udev ) vlc? ( media-video/vlc:= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon )
 REQUIRED_USE=browser? ( || ( alsa pulseaudio ) ) lua? ( ^^ ( lua_single_target_luajit ) ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
-SRC_URI=https://github.com/obsproject/obs-studio/archive/29.0.0.tar.gz -> obs-studio-29.0.0.tar.gz https://github.com/obsproject/obs-browser/archive/fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz -> obs-browser-fc62563ba4232649b7e0ffd772e66ad71ba49377.tar.gz https://github.com/chriskohlhoff/asio/archive/b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz -> asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz https://github.com/nayuki/QR-Code-generator/archive/8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz -> qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz https://github.com/nlohmann/json/archive/a34e011e24beece3b69397a03fdc650546f052c3.tar.gz -> json-a34e011e24beece3b69397a03fdc650546f052c3.tar.gz https://github.com/obsproject/obs-websocket/archive/31f9845b6132e6c1529401292bc1125401e2a324.tar.gz -> obs-websocket-31f9845b6132e6c1529401292bc1125401e2a324.tar.gz https://github.com/zaphoyd/websocketpp/archive/56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz -> websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2 )
+SRC_URI=https://github.com/obsproject/obs-studio/archive/29.0.2.tar.gz -> obs-studio-29.0.2.tar.gz https://github.com/obsproject/obs-browser/archive/1c2264d722f065646b72ac654f6ddbb6843f9bef.tar.gz -> obs-browser-1c2264d722f065646b72ac654f6ddbb6843f9bef.tar.gz https://github.com/chriskohlhoff/asio/archive/b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz -> asio-b73dc1d2c0ecb9452a87c26544d7f71e24342df6.tar.gz https://github.com/nayuki/QR-Code-generator/archive/8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz -> qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz https://github.com/nlohmann/json/archive/a34e011e24beece3b69397a03fdc650546f052c3.tar.gz -> json-a34e011e24beece3b69397a03fdc650546f052c3.tar.gz https://github.com/obsproject/obs-websocket/archive/31f9845b6132e6c1529401292bc1125401e2a324.tar.gz -> obs-websocket-31f9845b6132e6c1529401292bc1125401e2a324.tar.gz https://github.com/zaphoyd/websocketpp/archive/56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz -> websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz browser? ( https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2 )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ae124b2b096eff4d4381348bcfa10ad
+_md5_=8ba3d25318f4ee3499583bff1f8b07d0
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 2c8711e26f7f..c0e63c7c5274 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-1.4.7-r1 b/metadata/md5-cache/net-im/gajim-1.4.7-r1
index e0af7509fb04..3f46a1b9d387 100644
--- a/metadata/md5-cache/net-im/gajim-1.4.7-r1
+++ b/metadata/md5-cache/net-im/gajim-1.4.7-r1
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-3.0.0[python_targets_python3_9(-)] <dev-python/python-nbxmpp-4.0.0[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_9(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_9(-)] dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] >=dev-python/python-nbxmpp-3.0.0[python_targets_python3_10(-)] <dev-python/python-nbxmpp-4.0.0[python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,xml(+)] )
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_9(-)] <dev-python/nbxmpp-4.0.0[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_9(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_9(-)] dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_10(-)] <dev-python/nbxmpp-4.0.0[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite,xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.4/gajim-1.4.7.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=92230ac7d74cd5a818be1f80c5e2d65d
+_md5_=9782be1b4a156804fd44b0092ff655bd
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 7d92c6f6352e..da64c4f1a38a 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/c-client-2007f_p7 b/metadata/md5-cache/net-libs/c-client-2007f_p7
new file mode 100644
index 000000000000..7e953bd7ad57
--- /dev/null
+++ b/metadata/md5-cache/net-libs/c-client-2007f_p7
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile install prepare
+DEPEND=ssl? ( dev-libs/openssl:= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 )
+DESCRIPTION=UW IMAP c-client library
+EAPI=8
+HOMEPAGE=http://www.washington.edu/imap/
+INHERIT=flag-o-matic libtool toolchain-funcs
+IUSE=doc +ipv6 kerberos pam ssl static-libs topal chappa
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=ssl? ( dev-libs/openssl:= ) kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) !pam? ( virtual/libcrypt:= ) ) kerberos? ( app-crypt/mit-krb5 )
+SLOT=0
+SRC_URI=ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.Z mirror://debian/pool/main/u/uw-imap/uw-imap_2007f~dfsg-7.debian.tar.xz chappa? ( mirror://gentoo/c-client-2007f-chappa-115-all.patch.gz )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=e52c763c92c7937d4f7e63d9edffa106
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 85a252b5d1f8..563329f817e2 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/icaclient-22.12.0.12-r1 b/metadata/md5-cache/net-misc/icaclient-22.12.0.12-r1
index 3f58d313cae2..98f8d8b8372b 100644
--- a/metadata/md5-cache/net-misc/icaclient-22.12.0.12-r1
+++ b/metadata/md5-cache/net-misc/icaclient-22.12.0.12-r1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.citrix.com/
 INHERIT=desktop wrapper xdg-utils
 IUSE=l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=icaclient
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret dev-libs/glib:2 dev-libs/libxml2 media-fonts/font-adobe-100dpi media-fonts/font-misc-misc media-fonts/font-cursor-misc media-fonts/font-xfree86-type1 media-fonts/font-misc-ethiopic media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 media-libs/libogg media-libs/libpulse media-libs/libvorbis media-libs/mesa media-libs/speex net-libs/libsoup:2.4 net-libs/webkit-gtk:4 sys-apps/util-linux sys-libs/libcxx sys-libs/libcxxabi sys-libs/zlib virtual/krb5 virtual/libudev x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrender x11-libs/libXt x11-libs/pango hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 ) !hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
 RESTRICT=mirror strip fetch
 SLOT=0
 SRC_URI=amd64? ( linuxx64-22.12.0.12.tar.gz ) x86? ( linuxx86-22.12.0.12.tar.gz )
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=989d234ee4034a91094bc15393f4ada4
+_md5_=5af8d68276506afb752352b078c2d92b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6efeb862036f..ec68faf358a6 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.18-r1 b/metadata/md5-cache/sys-apps/gentoo-functions-0.18-r1
new file mode 100644
index 000000000000..baae434d86e6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-0.18-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Base functions required by all Gentoo systems
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
+INHERIT=toolchain-funcs flag-o-matic
+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 ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/findutils-4.9
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.18.tar.bz2
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=45da28e43e2f826ff5d7b7fdedc510ed
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-9999 b/metadata/md5-cache/sys-apps/gentoo-functions-9999
index 55dbe212be6d..c7283e9d4921 100644
--- a/metadata/md5-cache/sys-apps/gentoo-functions-9999
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
 INHERIT=git-r3 toolchain-funcs flag-o-matic
 LICENSE=GPL-2
 PROPERTIES=live
+RDEPEND=>=sys-apps/findutils-4.9
 SLOT=0
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=dbc7b0988e8df080d372e952650c2309
+_md5_=45da28e43e2f826ff5d7b7fdedc510ed
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 00e8d7025c4b..b0ea163df59a 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.55 b/metadata/md5-cache/x11-libs/goffice-0.10.55
new file mode 100644
index 000000000000..761a87f0552d
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.55
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+DESCRIPTION=A library of document-centric objects and utilities
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
+INHERIT=gnome.org libtool
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg(+)] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+SLOT=0.10
+SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.55.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=92e518cc46832b9e1d97675f44dfe57e
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.36 b/metadata/md5-cache/x11-libs/gtk+-3.24.36
new file mode 100644
index 000000000000..fea2701b7a6e
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.36
@@ -0,0 +1,19 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 wayland? ( dev-util/wayland-scanner ) >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-libs/gdk-pixbuf:2 gtk-doc? ( app-text/docbook-xml-dtd:4.3 >=dev-util/gtk-doc-1.20 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-accessibility/at-spi2-core-2.46.0[introspection?,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/fribidi-0.19.7[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/glib-2.57.2:2[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/fontconfig[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/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.14.91[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/wayland-protocols-1.21 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( media-libs/libglvnd[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Gimp ToolKit +
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 meson-multilib multilib
+IUSE=aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
+RDEPEND=>=app-accessibility/at-spi2-core-2.46.0[introspection?,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/fribidi-0.19.7[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/glib-2.57.2:2[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/fontconfig[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/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudproviders? ( net-libs/libcloudproviders ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.14.91[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/wayland-protocols-1.21 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( media-libs/libglvnd[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[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-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
+RESTRICT=test
+SLOT=3
+SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.36.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	8d5c1c4ecef47fa1b4576a718c620d1d	toolchain-funcs	9a610728b9bcca1919234cceb35a1027	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=04250f3e55043aeac26040b2a570aec1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index aed4cd164708..f62859296b8e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15152 BLAKE2B c1d08f39453125718bfb044cbe0dd8c2d1d6ee790e3d7e8488ae11fc536eb3f4232a0679f80662b1e041f8edd39b6ec4d2d39c7e6ac1b418151d9c3853698313 SHA512 b37bf15aece1c30972723d2b64d1d1613bce0e6747a01563fb993e46731ebc5b99ca0625ecd9086c739877084416aa12e6c2a5650a2bfe625796875f89cc89dc
-TIMESTAMP 2023-02-06T02:39:39Z
+TIMESTAMP 2023-02-06T08:39:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgaGtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPgvMtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDUNBAAh/yhbmD2pW0wQCujEZgommZYGLyfNPAhkSLvTZGOfr13BkCsC8Y2dUHe
-rxQQFfB/OVTd19qhwkK5BqIpm8M0O1MhxHVpFJ42MQHeAeIIR2JZ7EhGQAWsxfpU
-vWTNkJVyvR6vCvNjBNB5TDrgx/vd0aOqP84sJOR4dqrp7iYuhJuBjcir9xPtq9T3
-swjeQVBz5S5N/+HtZEEiJDlJMYpHjtl1IBN6pPS7u6BJhxO4Wm9DNY2FdzElUWRI
-EQt74DrGL98k4Icmu5D6MNUaleLwffY77kOUBQv57I7uDSQfRgF73Jd2CsvhiDcc
-i6G94ZkPYX+uHr+0V4eUjf8Srta1CwKA/hffshp+Lq1r5h6xOc1Jmclsa9xVn6GJ
-0GhpCckPjCj6RN5TLIMzQiR2DDqVMIXOdfYa1glQH1ZOp4zJJU6NrQMwDM3LboJc
-WwdClIbuRrZ7vbcuW6biNAjN/9vt4XY/sejoWMAROR3hh3gZEj8p69hamap24gza
-yTWV64Oy3qaaC3CJ4bAx0+jrqhc+Fg4OtpYzb8tD+megFPvF5TDTRMNgMS79eOJd
-o3QH+xe3Tqs0e0YznwcVZZGHfwd3mnd/2beWpDtie4lTwoflQVDnkl0mXYke/DPp
-00CXOWyTyIibG3pVO9xEx9fPG+nDEAO4wTlOWyfyccdHlhRMcVE=
-=O24O
+klC6Zg//UQPkCmPRNoRxebG/b9nFoJ81eaTdaEiJ4bLsHp8IIcXoAy/YopqUeLdS
+T81v3dDC0LKgh0leeaYqrcdRqNaowwGli+ac+3hC4vW/Lrgiduf743+5NQxdCDf6
+H9+pOCJDLQStA+pVxML/BEvQl3RJlVVhsejXWjvCe2VRikmsSjO/2LhaDDjJmwFu
+V2cuqTEecTw0xoXYH4Uz9lskwyGXKHyPkSTSUd08KiOpgo1UA82HgH4QDdFKv6Fm
+VgpVh3ykp/XGPTpWrzYo7kAi/9LBOW1upXDC0lclKxsEWVS0CxjfO6LR0VzuS708
+qWw4Q+wUClr7wGt2abpG1zu6UQn3viyrPK3LI7AZFzbfkMJk7zuAQ32v17/ljOFg
+KLb1oZuKRxovQCDM8CmiOz2xbZEARUMrlnuamix7CvmjSTiBhtAmt5gjpNQ/MGzG
+KZFAP882JzjjJCs28VyFbbSMtKK+0A5ygvI5UvLzIGvuS0mXIKkwHvvS6ljCk+So
+Yl1FNop5pq8xDEsfPD4zjVmIffANvebZE36s8tCoyhT7yLphaFmT4AN3kA8fFogI
+DKUZBc3OXyJoCyQ6g21JQAb38SHUKH/9kxVYlHA0U65UtC/BvOQgWaqpiQKbL5U2
+OGQUpVh2Encmlu5RvoAYiBh7M4O9sXrXInphsiSRjJMQr5mNpTw=
+=7bwj
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 23afea5d57bc..1ddd348060e3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Feb 2023 02:39:37 +0000
+Mon, 06 Feb 2023 08:39:36 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3b2e90c15361..9e0754f1e1f6 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Feb  6 02:39:36 AM UTC 2023
+Mon Feb  6 08:39:35 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 34206895cd08..0ac0993d68bb 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Feb 2023 02:45:01 +0000
+Mon, 06 Feb 2023 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3682e6aa3f54..31815eb941c6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7ea2b92e5af2a1ceb69f4be304edf66c19f5f851 1675649400 2023-02-06T02:10:00+00:00
+bf77358e85a589b8e0824a5059805321e65f8a44 1675670330 2023-02-06T07:58:50+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0a6999dad8af..826a5d6c5390 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1675651201 Mon 06 Feb 2023 02:40:01 AM UTC
+1675672801 Mon 06 Feb 2023 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b6db7fdbc6dc..1ddd348060e3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 06 Feb 2023 02:39:36 +0000
+Mon, 06 Feb 2023 08:39:36 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index c33371b8677b..9503ef78fd27 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 48d52070aedd..d37476ad6943 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1,3 @@
 DIST gajim-1.4.7.tar.gz 7184866 BLAKE2B 9be0ae485a372683623eff1f9ed1d209800c3088bf01c134bb5c6f1770e8ded1ebe6c2b301ad648c6cfb1793e2be43aade1410a701f7d0490f2ab1b0a4c3fdd5 SHA512 5988f6b7aa46166208b1693b9e1a5fe982cea2987f3f4170bcb14e4bb9be1154b1c6ceed020a949131a498db43d2dffee30bd3167cd56889c1cbb5641ed960f4
-EBUILD gajim-1.4.7-r1.ebuild 2697 BLAKE2B 282594db2458737e3fef420ce08cbb972dd740708f7e7e75bf4545979540036261621f25250b5c94b23fd30bf7e176b7ef4141826119a8ced4223487864aac53 SHA512 1e874e32ef0773b0f17a76311cbb03d564062fee9491fd9b2c03835e0e4532fb001ed7f36b4264a1768bde4c898560666d4f43f38f4eb01b0d0d6d509ec3cb4f
+EBUILD gajim-1.4.7-r1.ebuild 2683 BLAKE2B f57cde81044d072f7d625ea0304a5f914d8063d3aa0d90b2e30e7f9532c49fe9986b81ab5898ca41ad6d08c0cd3036cae4410e041833e0b0164c95e378388bb9 SHA512 09b0aa690b7fc7663b165ea4c5d3737b92982132f0c4a3f2429cd633f9aed52db05029a9c9c5be269e983fe0631a7249a3efb1a1235dae2c25ab26a7eb3c5cac
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.4.7-r1.ebuild b/net-im/gajim/gajim-1.4.7-r1.ebuild
index cbdbdc446f51..a0769f76a3cb 100644
--- a/net-im/gajim/gajim-1.4.7-r1.ebuild
+++ b/net-im/gajim/gajim-1.4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,14 +30,14 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/idna[${PYTHON_USEDEP}]
+		>=dev-python/nbxmpp-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/nbxmpp-4.0.0[${PYTHON_USEDEP}]
 		dev-python/precis-i18n[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/pycurl[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
 		x11-libs/libXScrnSaver
 		app-crypt/libsecret[crypt,introspection]
 		dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 00e75cff6624..3d0b6b08e11a 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index edf68badf462..9720b8fa899c 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -5,7 +5,12 @@ AUX c-client-2007f-ldflags.patch 1652 BLAKE2B 622c3c1f10e4a4500fbf008073e5e9131a
 AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98ecae803452e30d5c8e6149c3744084174751253b2e58ee83259aaad3fd24bf15bd901e509c84792f12d4ad350f26939a32 SHA512 45ef128f1fcda303ab163ffe9b21e319d7dbd6c60940d8f65996feab81235d5f652e24c340b0cdc8a3d9ae1ad1b0d8f8e55e64668d26d135fb06717adea4c7d4
 AUX c-client-2007f-scandir-callback-types.patch 6747 BLAKE2B b300133fed2dbd9c01a0abd5ff8e64f72affdb1d5aeed4bf5089588895bc2ce6cf904c9a8660da8eb7d53e883266f38cda140d396da63d6db67c354b73492832 SHA512 1c461c7114e2cc238b8716936708df1f5faf747f79c49308d35384b27c4809577c26a77e7753668a576f68a37ee78debb8c7533820f21d0da6f40b2b2c6e2c1a
 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00
+AUX c-client-2007f_GENTOO_amd64-so-fix.patch 519 BLAKE2B f396e4d406d84b63e4f5325b1713977dfc896c77c4f43cd1deeaa9a035c601d462ae12bdc549facacb23a043189c9953f5bee055c11976814cbf046c55b76a43 SHA512 21fb5d485b0a1236572a10d0b92f9b025c8117b9a7549f43429077a6b213705b63923712fba1e52b773d935d2ca7cb58dcbe90640dc081bf794e321ece660e5c
+AUX c-client-2007f_p7-implicit-declaration-fix.patch 1067 BLAKE2B 32ae2ac3b19bb43bec0ca16c3507db46396ceb8628dc1cb5e7259ab39024bbd8ee029882af684e687537ff78835d1b36d9612fbcad9207a199ab2df9e9776dde SHA512 9c0276c32059e17fb17a466da4a87b2a4c8e08d0671d14e37e5dd02e52faaec179e92e7b9fa20f40bcb7ac24d3da8d22ba00b4575ccb38c7680402d888e228da
+AUX c-client-2007f_p7-ldflags.patch 1557 BLAKE2B c9e2575f5e87742061b6f4deac5ce510aabcc0f28ab59a8c45235cd466495d7046ad59393df9f2ebd16e4f61e1c6235a79b8c94fcaf3e431a380814feab0d7bf SHA512 f399e030ba2d0c406ccc2f9682594060400a524cef8ed9a808b6c5e011dcc83421582f750738e5b2550596a193b8164814e3ef9f6dfa4ebe71eaf501929c4726
 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
+DIST uw-imap_2007f~dfsg-7.debian.tar.xz 44960 BLAKE2B 836dfd9a5922cd3043278a89c87276c974c8e91c5831a94caef6e73b2839d246bda879f67bdad88ae59888b5dc8b6ca366aa48b6d197508cd10cdc68f1e7027f SHA512 3a903062c782c942d4c7a1122be686e301ea4d4c6f6ff1dbc78ae29c7ee7b8e02fb25a903401e6a7047ddccaf6bcceba953f6cad1c1890cd6410ea909b014af6
 EBUILD c-client-2007f-r8.ebuild 4682 BLAKE2B 112dc23a462b3bb2c6655e7a76250346de062dfa59edd0112c3bc410a1195f6e80e81d535c3bacd786b9c1965e2a60ba5464236e714d900390a30c7844214d20 SHA512 c076573cc0df3983119f0a0b30cf25206d2072091d7ba108b68681c4a3650cd5d726b468183c17ab429ac083ecf1cdbc248332d24830989d916a35d0997e9f05
+EBUILD c-client-2007f_p7.ebuild 4773 BLAKE2B 4066c62a8d663e8e8c9655c99cb2d2114bd2380ac6a15b0d48e9ea52a0d8cd4fa3bc996b1fc81bc407b80ea522f833bb5fcc36074fad51d0d6ecfadd71b9c386 SHA512 1855a5fa17bd33dc4c93c74d0ddbe559373de393b08c37df0baf5e7792491773b4407c7ecb85651bb24bbdbb7a05a669dc2addba1583b371d2d9b105f19ed671
 MISC metadata.xml 481 BLAKE2B c10dea9f32197ea0f48c7d4c4de5d082640bbb424be1e8e371668bcaebfdbd878b21dbe1a43dda5d347f186874c119047485f27ea067495f2eb2d7fa7fbbdb5d SHA512 b153757f61ebba9aa79b1a57b52e3c5e7a3299c17f9ccb2b0f815b2799469c5b29dd4a598f923f9037c6804175f2014c2ec3803cd092a9b21f470b0e5e764c53
diff --git a/net-libs/c-client/c-client-2007f_p7.ebuild b/net-libs/c-client/c-client-2007f_p7.ebuild
new file mode 100644
index 000000000000..c3fd74b4a8a9
--- /dev/null
+++ b/net-libs/c-client/c-client-2007f_p7.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool toolchain-funcs
+
+MY_PN=imap
+MY_P="${MY_PN}-${PV}"
+
+CHAPPA_PL=115
+DESCRIPTION="UW IMAP c-client library"
+HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="
+	ftp://ftp.cac.washington.edu/imap/${MY_PN}-$(ver_cut 1-2).tar.Z
+	mirror://debian/pool/main/u/uw-${MY_PN}/uw-${MY_PN}_${PV/_p/"~dfsg-"}.debian.tar.xz
+	chappa? ( mirror://gentoo/${PN}-$(ver_cut 1-2)-chappa-${CHAPPA_PL}-all.patch.gz )
+"
+S="${WORKDIR}"/${MY_PN}-$(ver_cut 1-2)
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc +ipv6 kerberos pam ssl static-libs topal chappa"
+
+RDEPEND="
+	ssl? (
+		dev-libs/openssl:=
+	)
+	kernel_linux? (
+		pam? ( >=sys-libs/pam-0.72 )
+		!pam? ( virtual/libcrypt:= )
+	)
+	kerberos? ( app-crypt/mit-krb5 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+
+	# Apply a patch to only build the stuff we need for c-client
+	"${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch"
+
+	# Apply patch to add the compilation of a .so for PHP
+	# This was previously conditional, but is more widely useful.
+	"${FILESDIR}/${PN}-2007f_GENTOO_amd64-so-fix.patch"
+
+	# Respect LDFLAGS
+	"${FILESDIR}/${PN}-2007f_p7-ldflags.patch"
+
+	# build fix for -Werror=implicit-function-declaration and
+	# incompatible function pointer types, bug #870478
+	"${FILESDIR}/${PN}-2007f-scandir-callback-types.patch"
+	"${FILESDIR}/${PN}-2007f_p7-implicit-declaration-fix.patch"
+)
+
+src_prepare() {
+	use topal && PATCHES+=( "${FILESDIR}/${P}-topal.patch" )
+
+	default
+
+	use chappa && eapply -p2 "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch"
+
+	# Tarball packed with bad file perms
+	chmod -R u+rwX,go-w . || die "failed to fix permissions"
+
+	# Lots of things need -fPIC, including various platforms, and this library
+	# generally should be built with it anyway.
+	append-flags -fPIC
+
+	# Modifications so we can build it optimally and correctly
+	sed \
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i src/osdep/unix/Makefile \
+		|| die "failed to fix compiler flags and SSL paths in the Makefile"
+
+	# Make the build system more multilib aware
+	sed \
+		-e "s:^SSLLIB=\$(SSLDIR)/lib:SSLLIB=\$(SSLDIR)/$(get_libdir):" \
+		-e "s:^AFSLIB=\$(AFSDIR)/lib:AFSLIB=\$(AFSDIR)/$(get_libdir):" \
+		-i src/osdep/unix/Makefile \
+		|| die "failed to fix our libdir in the Makefile"
+
+	# Targets should use the Gentoo (ie linux) fs
+	sed -e '/^bsf:/,/^$/ s:ACTIVEFILE=.*:ACTIVEFILE=/var/lib/news/active:g' \
+		-i src/osdep/unix/Makefile \
+		|| die "failed to fix the FreeBSD ACTIVEFILE path in the Makefile"
+
+	# Remove the pesky checks about SSL stuff
+	sed -e '/read.*exit/d' -i Makefile \
+		|| die "failed to disable SSL warning in the Makefile"
+
+	sed -e "s:CC=cc:CC=$(tc-getCC):" \
+		-e "s:ARRC=ar:ARRC=$(tc-getAR):" \
+		-e "s:RANLIB=ranlib:RANLIB=$(tc-getRANLIB):" \
+		-i src/osdep/unix/Makefile \
+		|| die "failed to fix build flags support in the Makefile"
+
+	elibtoolize
+}
+
+src_compile() {
+	local mymake target passwdtype
+
+	local ipver='IP=4'
+	if use ipv6 ; then
+		ipver="IP=6"
+		touch ip6 || die "failed to create ip6 file"
+	fi
+
+	local ssltype="none"
+	if use ssl ; then
+		ssltype="unix"
+	fi
+
+	if use kernel_linux ; then
+		# Fall back to "slx" when USE=pam is not set. This ensures that
+		# we link in libcrypt to get the crypt() routine (bug #456928).
+		use pam && target=lnps passwdtype=pam || target=slx passwdtype=std
+	fi
+
+	if use kerberos ; then
+		mymake="EXTRAAUTHENTICATORS=gss"
+		EXTRALIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
+	fi
+
+	emake -j1 \
+		SSLTYPE=${ssltype} ${target} \
+		PASSWDTYPE=${passwdtype} ${ipver} ${mymake} \
+		EXTRACFLAGS="${CFLAGS}" \
+		EXTRALDFLAGS="${LDFLAGS}" \
+		EXTRALIBS="${EXTRALIBS}" \
+		GSSDIR=/usr
+}
+
+src_install() {
+	if use static-libs; then
+		# Library binary
+		dolib.a c-client/c-client.a
+		dosym c-client.a "/usr/$(get_libdir)/libc-client.a"
+	fi
+
+	# Now the shared library
+	dolib.so c-client/libc-client.so.1.0.0
+
+	dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so"
+	dosym libc-client.so.1.0.0 "/usr/$(get_libdir)/libc-client.so.1"
+
+	# Headers
+	insinto /usr/include/imap
+	doins src/osdep/unix/*.h
+	doins src/c-client/*.h
+	doins c-client/linkage.h
+	doins c-client/linkage.c
+	doins c-client/osdep.h
+
+	if use ssl; then
+		echo "  ssl_onceonlyinit ();" >> "${D}"/usr/include/imap/linkage.c \
+			|| die "failed to add ssl init statement to linkage.c"
+	fi
+
+	# Documentation
+	dodoc README docs/*.txt docs/BUILD docs/CONFIG docs/RELNOTES docs/SSLBUILD
+	if use doc; then
+		docinto rfc
+		dodoc docs/rfc/*.txt
+		docinto draft
+		dodoc docs/draft/*
+	fi
+}
diff --git a/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch b/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch
new file mode 100644
index 000000000000..3a3be7221185
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f_GENTOO_amd64-so-fix.patch
@@ -0,0 +1,12 @@
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -990,6 +990,9 @@ onceenv:
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+ 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(LIBRARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
++		-Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	>> ARCHIVE
+ 	echo $(ARCHIVE) > ARCHIVENAME
+ 	echo $(OS) > OSTYPE
+ 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
diff --git a/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch b/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch
new file mode 100644
index 000000000000..413ddbf43869
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f_p7-implicit-declaration-fix.patch
@@ -0,0 +1,46 @@
+This patch solves build issues with -Werror=implicit-function-declaration
+enabled.
+
+- safe_flock is a function from flocklnx.c but header file for consumers
+  is missing, the simplest was to add function prototype to other
+  header file.
+- utime.h is needed also in multiple places but os_slx.h header file is
+  used in all of them
+
+Bug: https://bugs.gentoo.org/870478
+--- a/src/osdep/unix/os_lnx.h
++++ b/src/osdep/unix/os_lnx.h
+@@ -46,6 +46,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <time.h>		/* for struct tm */
++#include <utime.h>
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/file.h>
+@@ -57,6 +58,7 @@
+ 
+ #define direct dirent
+ 
++int safe_flock(int, int);
+ #define flock safe_flock
+ 
+ 
+--- a/src/osdep/unix/os_slx.h
++++ b/src/osdep/unix/os_slx.h
+@@ -46,6 +46,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <time.h>		/* for struct tm */
++#include <utime.h>
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/file.h>
+@@ -57,6 +58,7 @@
+ 
+ #define direct dirent
+ 
++int safe_flock(int, int);
+ #define flock safe_flock
+ 
+ 
diff --git a/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch
new file mode 100644
index 000000000000..8a273355c2f9
--- /dev/null
+++ b/net-libs/c-client/files/c-client-2007f_p7-ldflags.patch
@@ -0,0 +1,33 @@
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -975,23 +975,24 @@ os_sol.h:
+ 
+ # Once-only environment setup
+ 
+-once:	onceenv ckp$(PASSWDTYPE) ssl$(SSLTYPE) osdep.c
++once:  ssl$(SSLTYPE) onceenv ckp$(PASSWDTYPE) osdep.c
+ 
+ onceenv:
+ 	@echo Once-only environment setup...
+ 	echo $(CC) > CCTYPE
+-	echo $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
+-	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
++	echo `$(CAT) CFLAGS` $(BASECFLAGS) '$(EXTRACFLAGS)' -DCHUNKSIZE=$(CHUNKSIZE) > CFLAGS
++	echo `$(CAT) OSCFLAGS` -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+ 	 -DMD5ENABLE=\"$(MD5PWD)\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DLOCKPGM=\"$(LOCKPGM)\" \
+ 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
+ 	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
+-	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
++	echo $(EXTRALIBS) `$(CAT) LDFLAGS` > LIBS
++	echo $(EXTRALDFLAGS) `$(CAT) LDFLAGS` -lcrypt $(BASELDFLAGS) > LDFLAGS
+ 	echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(LIBRARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSFLAGS` -shared \
+-		-Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
++	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` $(EXTRALDFLAGS) `$(CAT) OSFLAGS` -shared \
++		-Wl,-soname,libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" `$(CAT) LIBS` $(BASELDFLAGS) \
+ 	>> ARCHIVE
+ 	echo $(ARCHIVE) > ARCHIVENAME
+ 	echo $(OS) > OSTYPE
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 0bc8c4e1768f..8495ffbbfcf3 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 6c84843c79a0..7fca6464bd9c 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -9,6 +9,6 @@ DIST linuxx64-22.12.0.12.tar.gz 165269811 BLAKE2B 7735357f38d9438137792fc1d1febf
 DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
 DIST linuxx86-22.12.0.12.tar.gz 147837116 BLAKE2B d5f1c53d1f2d2ecb95e67df256a667df733251a99dd4a5e9584554521c4f1b1fbd065dfd8b1c4ba344a543c5cd7dde4a939e3d4d82f658e7dae42c07527b645e SHA512 8e9c4262dcd7731b88ae43a663d5901a21a9ede2feed163b538f5fb475f0eba8768a08715db5e9c8fa809442140d1ef03d4d4e509cb83142bea806855615a6b3
 DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
-EBUILD icaclient-22.12.0.12-r1.ebuild 6245 BLAKE2B dd0dd9c7351f79079e717aee5463237e9c2996bc6e5ec640d21402e1da3fca6a2b46f54ee3dd4843d9a77e074f4a46c59835a74bd89e382c75691889043210d0 SHA512 8ee4c0d1f9af3cad8a48bf0d3daf1abc2fa3875dee7e54e7a8d4b41d479e8a50839e807547e042219958bf76ecce89228d3e0c02a9310326d9cb4a564f6c5f44
+EBUILD icaclient-22.12.0.12-r1.ebuild 6243 BLAKE2B d2e67395e6b06d1b6fecfe520fbed706f3c756196589b9718099f22ac548e58fc22aa143123290472e32595808e0a123faba15f105efd06086230e2a70e35a9f SHA512 101f52262ff7bb543f49c5996ca1ae79febc41eb0df78bf1720fa3cfe9ee53aa37e38af172e83a388297b32438132dd640d1a99ed123cf110a22c42eeb31a080
 EBUILD icaclient-22.5.0.16-r1.ebuild 5600 BLAKE2B 4b79fe220715ff4464987a286e20cf7f22c69738a3e53e70deb92d77311181737e0767dbe6f3afe1c01ca33c8cd9ef0c47cc94cc5863d6f2611a49232d53871a SHA512 7148dce99640ca9fb715b5d7663af594502f29e16fd509f778b0460ff2f4e53673524b19642858923f3e079b7fbc76b4d71c176e77f1f1a824f0b920306a05e8
 MISC metadata.xml 489 BLAKE2B 5277ab65457a889a26aa1c77279d68eef6fd4bd8d602e0ca1a06fac51b5576ce4b7d976bbbaeea555fc6ba2be42d686cfb425b03088bd5dff789edafbf11bb5c SHA512 4c69d7956c48402fa1fac2c5adede5079f8daf7c07a04f4d05af185dfa0d13417d54ce0ec063c77f966814e057f732c995e9e26e896e3c55a20d7c71db62f82f
diff --git a/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild b/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild
index c29d64d2492d..46dfd10187a4 100644
--- a/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild
+++ b/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx"
 RESTRICT="mirror strip fetch"
 
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6a1c0caeb114..7b58737f33f4 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index 47be5d944146..e84d89f9b9ae 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -2,3 +2,4 @@ move net-im/discord-bin net-im/discord
 move dev-python/python-recurring-ical-events dev-python/recurring-ical-events
 move dev-python/snappy dev-python/python-snappy
 move dev-python/pkgcraft-python dev-python/pkgcraft
+move dev-python/python-nbxmpp dev-python/nbxmpp
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 021a4ab82808..f4bcc4590e16 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8770,6 +8770,7 @@ x11-libs/cairo:opengl - Build the OpenGL backend
 x11-libs/fltk:games - Builds and installs some extra games
 x11-libs/fox:tools - Install adie, calculator, shutterbug, and pathfinder apps.
 x11-libs/gtk+:broadway - Enable the GDK Broadway backend
+x11-libs/gtk+:cloudproviders - Enable GtkPlacesSidebar to access cloud services
 x11-libs/gtk+:colord - Use x11-misc/colord for color management in printing
 x11-libs/gtk+:sysprof - Enable profiling data capture support using dev-util/sysprof-capture
 x11-libs/gtkdatabox:glade - Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6468ba9c57c0..dcfb48fa6159 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 65f4aef78e8b..5e122753a0f6 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,6 @@
 DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
+DIST gentoo-functions-0.18.tar.bz2 11803 BLAKE2B d975b0227dd0370c072e34f11d8d6c427b90948e7469b214665d27805f5a4cada1dab2e1b9b3b32e032fdc42a82587d16c5b3a4766f85e9cb75ad74fac69cb0b SHA512 b96f71a5a84b84affb69f042cb4908f41a6b4c0328f9f0a325f523361560dc95c95b8bd5de5c22758d7038a1b564c2bd3f5d8fc63b72f87ab17523c555daa829
 EBUILD gentoo-functions-0.17.ebuild 856 BLAKE2B 40d05ab5cd71c649b9081cd7dd21a3393195032e06374de5c7a11f4de6d0586c684d564f6d8a1b8338499b23c32921bd132ff5730c992e744da93a1a7c107e7c SHA512 185801a68b4649d1fdaac371c59fb6b7d838d5e1b975c2d89c3b166a745bc4a6c64f57345e5b6641608332f85b4b81c4e1d69e49a089b112f2e3d916831765c5
-EBUILD gentoo-functions-9999.ebuild 864 BLAKE2B 8198b175c1f6c5fd752e73800822de676f65c536d1d4076ea2192251bd998e067af9eaa33e791afa58f6ce9b1376e3a429bd48aef71decfbb780a339df9f8bc6 SHA512 deab8524211f355bf937258af93b555c4d919d45258f5181fa30a33fe70d34fcb20ed1dedc019c71fc65177419b9c2d1b3f72eca4fe69e86ad04817d3e39b589
+EBUILD gentoo-functions-0.18-r1.ebuild 940 BLAKE2B f88bd96e16cdc04c15f034e8568bbd56954524fa6618a335be76644d465fb744c4f62a76c71e07eb9902bbc42b3b75988ab90874161e82216bf1299d2c3c9a6b SHA512 dea92319419d1196f588f1ec691400ee4128ed9320444a42938dd1919e40ad9219ce2ed1079a655063b42462f2afdb2722cf06e9179f0b8d9877ff19e1b27217
+EBUILD gentoo-functions-9999.ebuild 940 BLAKE2B f88bd96e16cdc04c15f034e8568bbd56954524fa6618a335be76644d465fb744c4f62a76c71e07eb9902bbc42b3b75988ab90874161e82216bf1299d2c3c9a6b SHA512 dea92319419d1196f588f1ec691400ee4128ed9320444a42938dd1919e40ad9219ce2ed1079a655063b42462f2afdb2722cf06e9179f0b8d9877ff19e1b27217
 MISC metadata.xml 416 BLAKE2B 08b6d649521646ff28c4738fbc3b9a292740bceb2430dab5ee4391bded078bd0c05dff69a28f722a1c23bbbb86af546935a055f93720ea759b141902f367394a SHA512 88409b09c14a2eb4859166e88f4a59ffc2e84e18a246b942f50ebd58bf83f0e6710f0405f08d102853cbd94562140a267cb60db29b4170893b7c3b3e24ec1ae3
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.18-r1.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.18-r1.ebuild
new file mode 100644
index 000000000000..decad7ffcca3
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.18-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2014-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
+	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 ~x86-winnt"
+fi
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Specifically needs GNU find, as well.
+RDEPEND=">=sys-apps/findutils-4.9"
+
+src_configure() {
+	tc-export CC
+	append-lfs-flags
+	export ROOTPREFIX="${EPREFIX}"
+	export PREFIX="${EPREFIX}/usr"
+}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index cf5513d3fcf8..decad7ffcca3 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2022 Gentoo Authors
+# Copyright 2014-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,9 @@ HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
 LICENSE="GPL-2"
 SLOT="0"
 
+# Specifically needs GNU find, as well.
+RDEPEND=">=sys-apps/findutils-4.9"
+
 src_configure() {
 	tc-export CC
 	append-lfs-flags
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 60dae7f276cf..fd533eb48a92 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 22a0d16beb24..58141fc9a129 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,7 @@
 DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
 DIST goffice-0.10.54.tar.xz 2443132 BLAKE2B 83ded093730e214b0d20563789ce13aa959d14fd0911068898afcfe7eaa61f1d42a9aa0e97124a7df585474a290414f077d0fbcfc916e7b41726c56215f16fa6 SHA512 d2c23b211bf5d7148a72e6f76629590418e776f789b763fd234f9008e7e8138e6e4077e2c5ecaf6893b944ee1725899aa89544342b0a8bdf3efde4833ca53304
+DIST goffice-0.10.55.tar.xz 2455576 BLAKE2B 6a1a4670293e0d91c456b3ec162f92f373eeea218d4b4268ae4809b8157cefa4f3d89f3f8555ee2fd3db84fb5adcd0e4119f0e2f6c79cbd4e86d27a46c9ea726 SHA512 c49eec867e4147102b54b70847b495cad0e55fcb069c78a8374760121219b9097c1dfb5601b240e92ed68a6fb785ab5e771f7c579dd138e106ee25a1b9ddfe99
 EBUILD goffice-0.10.53-r1.ebuild 1428 BLAKE2B 25a9851a86248219966c86c39b6b781868879fc79386b3d126d56162cfeeb72accf14dfcbfc32f5e278e01c6be0f29d57ba33f974e5f07f66cf925084316b051 SHA512 99f9bd0341288b95362beb57a0e11af51b5a0eab68e633f3f93e822c42025d9b80d9a307084439002a5e7fed3850a82b21498444c4bcf96164495b76d70aadce
 EBUILD goffice-0.10.54.ebuild 1430 BLAKE2B 8521930d2d1baa96b9751429f37bc70d8bb840c178b75746343405e9ad2e44413af528afabcaf37b794e060209e0a74581d30c4f5f95a23c6f8cca0b7a98a4dd SHA512 54035db69e6cc2cae4ea57aa1415cfde89e4933350ecf7cc3a10e56b369116111be6c462e9dd629f732af308ef62c46be03282a902ec8ada83471ad7895d6525
+EBUILD goffice-0.10.55.ebuild 1430 BLAKE2B 8521930d2d1baa96b9751429f37bc70d8bb840c178b75746343405e9ad2e44413af528afabcaf37b794e060209e0a74581d30c4f5f95a23c6f8cca0b7a98a4dd SHA512 54035db69e6cc2cae4ea57aa1415cfde89e4933350ecf7cc3a10e56b369116111be6c462e9dd629f732af308ef62c46be03282a902ec8ada83471ad7895d6525
 MISC metadata.xml 653 BLAKE2B 5dcfe5914dc4466682862c4171d1d54f8547a8bab5794bf1e95c709e84d52e4aced8c7376674d85937d424766205f317de0de199595fbca15c817b6c3c4a3b25 SHA512 49d62e1f37f3d50f9e3d9ad50c69da19289cf1aac03afdfaa2f472c77e9277c76d81f59b26f2a84ce42e690341a3a26854814f0ca125b4f05a55670cc260e715
diff --git a/x11-libs/goffice/goffice-0.10.55.ebuild b/x11-libs/goffice/goffice-0.10.55.ebuild
new file mode 100644
index 000000000000..9e1f7c7809f9
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.55.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.4.12:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=x11-libs/cairo-1.10:=[svg(+)]
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/pango-1.24:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	dodoc MAINTAINERS
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index fe441b0767c6..90d8ff8b4948 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,10 +3,14 @@ AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e3551
 AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc99d06da9dc0edee3f60a747cdd4ec1ec42ec2d3552d6c29566dbe9a744ad816bfac0d0e798ac60e8a0664b8a94e37e5 SHA512 b9e5f876f35f8f7f1fa07b82d2bd8ebbb4a4e6973e61ac9d9c678b76a8c653ca5b90504407b927e0023f504208a198d790f52cda9601eadff669d62e7db1dd1d
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
+AUX gtk+-3.24.36-introspection.patch 679 BLAKE2B 40189e7b16b4a10304a26f94eea2146bbaafd6a16134d5d7f3c1d957f609ccba558e946009cb691a52c3d5e94ebb6b519490fcecf29325e7bf085d3a4fbdeabe SHA512 f88b8974adfb8dd8f1517831703980e688be9fc6c218620b7c7e2747c7cbbe1d0831ffc5c5a0f4d873738c81f8fbe0eab79d06741c513afa8d66004cf94c64fa
+AUX gtk+-3.24.36-update-icon-cache.patch 774 BLAKE2B 0e7a5b3612147906c91772f496de25175314b601d7ff91c855902f19cb0081e932cc96a90752ae8aa147c4c80868e8d7b01c5e5044695b7710aecaedbd92d5ec SHA512 b8049f77063ac994a0f2222d9e776dd1038636a0920624b027e891f72dd393b825304190118dafc97c733f56554a41e9ceed4f1069980b2913b7b3f4ace23d83
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
+DIST gtk+-3.24.36.tar.xz 12540184 BLAKE2B 3d9346a3fbc78420eb8edcbad42d9885bed69ce46505bc15819691d884f31aa72386fcd38837e042ba9be3cda6cf5203f921c7f6054a7350c46dee6b77fc4cc4 SHA512 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
 EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
 EBUILD gtk+-3.24.35.ebuild 7018 BLAKE2B ca017af92b058f58b51f6bf49f751188cf97702b0b7eba11626a024a5aeace8c4ac6b9bd16cdd3ca200a0bdc84ffd7f06caf7971ac9b194efba6fc1ef3f78e3c SHA512 084deed3cd289cb2b35163bb7aec97b7ee98ced90c136581e3fed6d04c2674059bb4ef7e6adc2632b133e73a5c860764c877de2d5036a96b2c304a3a1645d2c9
-MISC metadata.xml 953 BLAKE2B 29defa50a776f75e114697ad02f4ff22ecd813dd6f67ed6674f6edad57cb1db8e3bc548a98497d4c1f6133c98318e95901c9b602026e225d8dd1350e2dd5858f SHA512 00669a6a0befecca4766adf61de1e0986754ecef00af45d6d3a33724e06ffb86476e4523cf06a214d2add354ee08065dea55f31b6173e27ec3f58fc39b53570a
+EBUILD gtk+-3.24.36.ebuild 5370 BLAKE2B e12365147d0c315723aa876b3810db65b45be7359dea6d985290ccf323af30248a9f848bd267e9f343cfc046b4d44a455a4e9133be0915894ee36ac34fd68f52 SHA512 c17d72ff7f6fba6cf0a8cb807c0b157313928dbf49642d664f9fd491ac31ad3a4a511d40fc4cd04e0f94478cb34459fe05b4830488010ad0b359a2cfb2a07852
+MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
new file mode 100644
index 000000000000..8b80205b8b17
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
@@ -0,0 +1,25 @@
+From 7e4a2a5724a184c418314f4fdbd7a065ba9e203d Mon Sep 17 00:00:00 2001
+From: Staudey <staudi.kaos@gmail.com>
+Date: Tue, 27 Dec 2022 04:54:52 +0000
+Subject: [PATCH] Fix build_gir logic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index aed48fc3f6..6c711e9e9a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -849,7 +849,7 @@ endif
+ 
+ # Introspection
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection'))
++build_gir = gir.found() and get_option('introspection')
+ 
+ subdir('gdk')
+ subdir('gtk')
+-- 
+GitLab
+
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
new file mode 100644
index 000000000000..19af75c398a5
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
@@ -0,0 +1,29 @@
+--- a/docs/reference/gtk/meson.build
++++ b/docs/reference/gtk/meson.build
+@@ -500,7 +500,6 @@
+ 
+   man_files = [
+     [ 'gtk-query-immodules-3.0', '1', ],
+-    [ 'gtk-update-icon-cache', '1', ],
+     [ 'gtk-encode-symbolic-svg', '1', ],
+     [ 'gtk-launch', '1', ],
+     [ 'gtk-builder-tool', '1', ],
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1109,16 +1109,6 @@
+   extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc)
+ endif
+ 
+-gtk_update_icon_cache = executable(
+-  'gtk-update-icon-cache',
+-  'updateiconcache.c',
+-  extra_update_icon_cache_objs,
+-  c_args: gtk_cargs,
+-  dependencies: libgtk_dep,
+-  install: true
+-)
+-gtk_tools += gtk_update_icon_cache
+-
+ gtk_query_immodules = executable(
+   'gtk-query-immodules-3.0',
+   'queryimmodules.c',
diff --git a/x11-libs/gtk+/gtk+-3.24.36.ebuild b/x11-libs/gtk+/gtk+-3.24.36.ebuild
new file mode 100644
index 000000000000..f184d909fff3
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.36.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson-multilib multilib
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.2.0:=
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudproviders? ( net-libs/libcloudproviders )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.21
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-introspection.patch
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use aqua quartz_backend)
+		$(meson_use broadway broadway_backend)
+		$(meson_use cloudproviders)
+		$(meson_use examples demos)
+		$(meson_use examples)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		$(meson_use sysprof profiler)
+		$(meson_use wayland wayland_backend)
+		$(meson_use X x11_backend)
+		-Dcolord=$(usex colord yes no)
+		-Dprint_backends=$(usex cups cups,file,lpr file,lpr)
+		-Dxinerama=$(usex xinerama yes no)
+		# Include backend immodules into gtk itself, to avoid problems like
+		# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+		# user overridden GTK_IM_MODULE envvar
+		-Dbuiltin_immodules=backend
+		-Dman=true
+		-Dtests=false
+		-Dtracker3=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.win32.md that would get installed by default
+	DOCS=( NEWS README.md )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
+		else
+			touch "${ED}${cache}" || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index d2f389d5ce2a..7692b1145ef4 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -13,6 +13,7 @@
   </longdescription>
   <use>
     <flag name="broadway">Enable the GDK Broadway backend</flag>
+    <flag name="cloudproviders">Enable GtkPlacesSidebar to access cloud services</flag>
     <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>
     <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
   </use>