gentoo auto-resync : 14:07:2022 - 19:40:39

99 files changed, 1375 insertions, 273 deletions

diff --git a/Manifest b/Manifest
index a4f5b681ad13..b4b32f1b7465 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29617 BLAKE2B c91f705262d51426823716930e010c88beadd3d1bfdbcdd7170fe6c1c83a0e504c24d964fb4589ddc36fc0a599c90019346f1d525c18370d1d4444a656818392 SHA512 d53d474c66da5e47be515b51b125a27259e166a365b871b8973ee5595fce967f63a274806436e6eaf1a6596f42b0ce16fa0aa35f1a7b9a1d37851772c0177b97
-TIMESTAMP 2022-07-14T11:39:53Z
+MANIFEST Manifest.files.gz 29623 BLAKE2B 6497823dcbebf0f4204198cb258d434f535ecad60e065bd9573baa66a897514cfd107fdf6d09a5ba5910db5a01ee591e095a537e34ddba7d0894638ec2eb88bd SHA512 4a8c2e79f23f4a15402f94a2ad73707d0fdc93098d4a06303fbd86477868060656dba60e54bf795da2e3201955eda65085e46a5de031ecb3c04aa5db848f5f37
+TIMESTAMP 2022-07-14T17:39:55Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQVOtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBg4w//dGvKjJIox64UYOdcml7wfOS2BHFiW222OGY2KRsPPTJ86ddSbt65tfYK
-UiKknq33zlDs6KAORrLP0BOZfGR61a4usv41hTDsFg7XXWBVXS73ErNI1gAFcfeg
-6Vfp9JP6Hxv95OSzhJovvLT9A1Qtmp2jVApO4/GygSqE1zNOpgwYgP9aOR8Dl31q
-paAbDve/lbAwvCrFLvSkiOLIjXX7GbVt0ltXf/evZ/x/xSpt016t0kJOz/0ULiV7
-HAHL+Fgmlnumb2lX6qzywXvzStbcoGEgdNZjMkpZjNNsPqn61UL3NJOwrTq7zjGA
-XYpU3MT+gYdYYvGpo4QpFBW3xhnn/QtQQ0oLy2GZAHRbPsMJcr28gBltDnQuFy6B
-0Sjfhglhyoam0bOtd/tNcy9bI/jADT7Za0ZGNJ6NAGupG00uI+GYDLgtn6sTvnUi
-nK7AujUndc6RvHtt6GW6+uh0QmWwXWmTp617SEDl8ke9Big/iV6jK5Elmw/MEPHI
-yP21dzYTuxMak5m564ovCYek+vxc7C+PWldPDoFtJiMUH4QxKldD09KnAnqzHAV2
-qpU20GleD+jw/1brajq6ZCiuIxjHkr9mfNiH0MKHy0iXAo5MJNFZiyOiAZ7xi4uJ
-zcWCmcvNAaPld6Bo6kr6eDSL8+l4QQVS298Cmb0xgvQVfirSy1o=
-=DwUC
+klBb7Q//dRPvP2M2/fMBWmymUc6W3bySiMauFQoiCacpUwhXZyaWTcSvoBQZYBfn
+B69fGQlHGvlyZrYl9cCyT5RvHZSroMyshY+8DMJ4VHSk4eYdgC2MzDPCTFBN/hSk
+7KA1pEA1lmvgQjP8q8V83FO5HbkgI9rRXCnLaDPiG4igfQYKEzN9jbNFKF86+B+v
+UBGtjmEzuCzTYJ62BG2QWswpR3UhqMvU2EFvMN9zbrkssRrhyk6UJzY6dvIUsPHz
+DuiIuVq471Q8TwoiML8kCHY82Y99IINY3eRRzgc5UY0RKk2qsAL3npdMU/2RePAM
+TwquCbNfusHDAbxUOhyIYphK1Lb32NWNNDjyKeSGAs5+oOBZMvf1LyMwxUTwfb84
+3j2VMGk6bODxSvDsKvDjBKocvmSxW4D951WJKT/NnD1SkM8qiofPhBppi0pQt8pj
+RomcEBrNz18CqfaqncFcErDMS9aSy7o4/vicV4XfNyseehmg4HYZSDCPZOVVm1Ex
+0VFoI88SrrssA9LECUg7n4GhHA6vfWxK2F2Zb1IBbq5IRN/V6JCwpgsy6kNNz8/d
+k3mJWmFKeNBfMyrRd4qgCxMsxvDclq4oVN/MXi4BE68y6/a0a4INy72DALl68JAU
+fbWooP2TeBFzG5jdmUCK6ZDFuEMYpLgCAafOXLg6uu9Jk6A+Vc8=
+=T9N3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 57ed0683d73b..02e7254beac4 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c229f58665f5..ccbf61b493eb 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8ba9bc2873a9..3bbde7703fea 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -3,7 +3,9 @@ AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff79063159
 AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
 AUX proofgeneral-4.5-paths.patch 762 BLAKE2B 77f7b828dfa1648b6d8818951fca297194192b4c2d6ef2f510c25f33a9cb8d9db8f11a1dbeda5a9235d60063fcaede1ad10efbd2e28e2cbe0f6485af9d90bbcf SHA512 89d7ea239e5530e7dc2b6520bfaeafd68cc77db58ba0786401dad57d52e5fdaa3efe83e9402449581f89c683d044401a2f4aec93dc69c7fcae972d423cab6594
 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
+DIST proofgeneral-4.5.tar.gz 1198535 BLAKE2B 24f93200d01752fb358ac88531b4b34392b7b968c7dbd7a7b3dcedfe71fa985ca893465bff503e3fc0efd267faeb3f5d8bd3d35f68847a4c90252e3a0bdd456b SHA512 ab2eed43053e3b6749e840a8d742058eaa91bfff7edbe12ea67bc492ffab07e1d77cf6a7772cb8c42ac73cae2cce65b48898b1cd10a77b906089768f8055b366
 DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca
 EBUILD proofgeneral-4.4.ebuild 1630 BLAKE2B f78e6be268f2576d5ca1e01cd1dd20fded60131ada2bc0983ae98a4e416b1ae8eb8692aa6a0bfa2068d639db956a268af4687b05d37e2f8a3ef186628f08a987 SHA512 b81141f5efadb662a269fac178248dede7b5eaeca7394538265ced397a7d9eb89354c87c6cfd8aece39ecadd0ec552e7568183c7e844e8b4fef7eb7edfe2a064
+EBUILD proofgeneral-4.5.ebuild 1448 BLAKE2B bcc46d806529c29a321dc77ea830a5c499c423d4de71745fc492326cd65e80701420cb85477aa0204b8b57115c13f91f130e30692882edc41c4d19c1d51704d3 SHA512 ad8cb31e6329ee698e217aac94d0132e2069c37849e293e0b6b130aad43358cd0925df9c377764f910df013edd86530d555a4f6ba88f2cac4050f8ae226ec794
 EBUILD proofgeneral-4.5_pre20220228.ebuild 1490 BLAKE2B 0b9daae8ebf45d229562ec64ebc02b7ed9c1fc1d6f0d33f88f35750befc72997b94d0ca48bf0bf1698ed47fd491f9fc6794b9dea623910dbc9ab550ee61d7ca9 SHA512 b5aab05798a31bd4ceec59af1af429babf746b577b6167cea8c791f893daa491d0e49618f621d5661e61ca3c01ce32ba45001391e6618a346a6b2d0c3b6eb38f
 MISC metadata.xml 656 BLAKE2B 5fde6e347ee778bf4ac7f46bd6b8928eb9fa1a6aaf02b8dff5b533f7dbf989799a6fa948161fccab5716ed7d61866750e8e8e8127a83258075009f2e1dd1a0e9 SHA512 481b819f3541c90b114f79eb831b0d1f0d7f3510e468f4b9d9ec7e98078dc4fc15c7fc983d25accd5a8ab3d588ff820af1d46d479bd11b6134fa1b0842072d2f
diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
new file mode 100644
index 000000000000..f662cbbface9
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit wrapper elisp
+
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="https://proofgeneral.github.io/"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/PG-${PV}
+
+LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4-desktop.patch
+	"${FILESDIR}"/${PN}-4.5-paths.patch
+)
+DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -e "s|@EPREFIX@|${EPREFIX}|" \
+		-e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" \
+		-i generic/proof-site.el || die
+}
+
+src_compile() {
+	emake compile doc.info
+}
+
+src_install() {
+	emake install-elisp install-bin install-desktop \
+		PREFIX="${ED}"/usr \
+		ELISP="${ED}${SITELISP}"/${PN} \
+		DEST_ELISP="${EPREFIX}${SITELISP}"/${PN}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# move images out of elisp dir
+	mkdir -p "${ED}${SITEETC}"/${PN}/ || die
+	mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die
+
+	# Create missing script, loosely translated from 4.4 version
+	make_wrapper ${PN} "${EMACS} \
+		-eval '(load \"${SITELISP}/${PN}/generic/proof-site.el\")' \
+		-f proofgeneral \
+		-f proof-splash-display-screen"
+
+	doinfo doc/*.info*
+	doman doc/${PN}.1
+	einstalldocs
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c5dedc833b74..8e2da48019ed 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/razertool/Manifest b/app-misc/razertool/Manifest
index ee7890d4cb2c..ee8caa6cb807 100644
--- a/app-misc/razertool/Manifest
+++ b/app-misc/razertool/Manifest
@@ -1,4 +1,5 @@
-AUX razertool-0.0.7-ar.patch 347 BLAKE2B 8225103a88e2fbbdcbc23546c06b6052c4d148dbde8151648fa9b4aa563c815296a7801c8b10a5337aa762cd8e2eb76aff3329b261033dff0082a5d1df9a12f2 SHA512 70c570cf089bd165b76adc4242d39b484333931352406d32324db80746151f6722c5a4fcd718b875d9cfae34ffd0d17bf02c63c94cc0f0b1addf43028f0f1734
+AUX razertool-0.0.7-configure.patch 6844 BLAKE2B 6492b444ec681b9e88350855a98386ab26f11132f0fdb37a5eabaa4b16b707b12d826f43b478b53c600727064766fb08cdca02ac628cb51de67ed4c4385be1e5 SHA512 66dfdcc491d84af91e14cd28b984b83c888bf1da7d43717aaf3bfa973d2c928d31b5f4e2f0c79d49300b98cca0ced6182041f859de56c113e30e904788941ed7
+AUX razertool-0.0.7-rules.patch 685 BLAKE2B 466e7b2f8c1afe5d897bd477b0175f2f76a73de23109c30a813963e2cbca43f6ac25e6da1c43e8794584e7c23253da91ba1ab2a1d6496ab2efe4bfef461d5454 SHA512 25a084ae4bc9610f9388b29fbcfeecdf5ed19a13248216562e105cf40c084aef251382c25f4c6261931e983e155c8a81d6402b9d47baa3671ee8068b643e745f
 DIST razertool_0.0.7.orig.tar.gz 192274 BLAKE2B 415896f9f6ebaf653be9ede84985b13149f27d4471a8aa53089d138f4f7d58a10ade2aa5f46ec88951572bc7ca1c222db5f88b3df6b37e3ef2ad544a2a7ff28e SHA512 0221ec90b55f4459f5a772eb651e9807423d9e3c82ebd680ee835167bcebf2552e1d7767d294c5392b1fbc58558084e7022cb67f529c033eaff33b4fb3eb1017
-EBUILD razertool-0.0.7-r4.ebuild 1762 BLAKE2B 8219eee8ab8ddbf25cddc3ff9d458a7cf7a2c4f7487fe90e0f5a0c41cc889d027826616808691bb5059aa5a7dd0c26fd24b1dc115a5125bc4fd3f8b2be44289b SHA512 3ad75bc24804ac6e0ffd72e186eaa6b0c352d510011eeb6ae23fce6b977ebf13f17c79818f2ba18cd49f0d5563bea3461f5c65701dd00513aca65e4f20ecd73b
+EBUILD razertool-0.0.7-r5.ebuild 1601 BLAKE2B 45502e28b15c4128bc6a0f56a3359a36b441e7b9875b9a72f4ba69222f18c0e6f848f629a20a14d5d55ab80a79ccd3b06e15f1781ca69d81212d5c98c2315b2d SHA512 21a684aa7138a323f3c64bd480ddebde3211a0a4984152aaf7888371ec3b19adb9b0e2eaeb340ac39ad7be19e3de006caa27e45f7270d7bb0b0989881eb4133b
 MISC metadata.xml 558 BLAKE2B 471cbef3552e5828c5aaec305cf318a6d30f36491e12f777ac18b639d9c49db83a4f42c2f66f5d8c9ecb3282766f3ec13fdaaf3f2ae3be51f8fba229a40c02dc SHA512 484d5e869c03fb44d7d6f8248350319a869f963cdcfb15149b4c4277ce07ff0e4be4e763e5f59a8cd9a9ee942c9de9fb2010252284f1ec3e9a0d865546fd0f09
diff --git a/app-misc/razertool/files/razertool-0.0.7-ar.patch b/app-misc/razertool/files/razertool-0.0.7-ar.patch
deleted file mode 100644
index b585205b1b92..000000000000
--- a/app-misc/razertool/files/razertool-0.0.7-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
---- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
-+++ razertool-0.0.7/configure.in	2020-09-03 12:53:51.991020189 +0200
-@@ -10,6 +10,7 @@
- dnl checks for programs
- AC_ISC_POSIX
- AC_PROG_CC
-+AM_PROG_AR
- AM_PROG_CC_STDC
- AC_PROG_RANLIB
- AC_HEADER_STDC
diff --git a/app-misc/razertool/files/razertool-0.0.7-configure.patch b/app-misc/razertool/files/razertool-0.0.7-configure.patch
new file mode 100644
index 000000000000..3fed676a28b3
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-configure.patch
@@ -0,0 +1,212 @@
+diff -Naur razertool-0.0.7.orig/configure.ac razertool-0.0.7/configure.ac
+--- razertool-0.0.7.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ razertool-0.0.7/configure.ac	2022-07-14 13:28:37.682934002 +0200
+@@ -0,0 +1,68 @@
++dnl Process this file with autoconf to produce a configure script.
++
++AC_INIT(configure.ac)
++AM_INIT_AUTOMAKE(razertool, 0.0.7)
++AM_CONFIG_HEADER(config.h)
++AM_MAINTAINER_MODE
++
++AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
++
++dnl checks for programs
++AC_ISC_POSIX
++AC_PROG_CC
++AM_PROG_AR
++AM_PROG_CC_STDC
++AC_PROG_RANLIB
++AC_HEADER_STDC
++PKG_PROG_PKG_CONFIG
++
++dnl checks for libraries
++PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
++
++if test x$enable_gtk = xyes; then
++pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
++PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
++	AC_MSG_RESULT([no])
++	AC_MSG_WARN([
++Package requirements ($pkg_modules) were not met:
++
++$GTKLIBS_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables GTKLIBS_CFLAGS
++and GTKLIBS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++])
++	if test x$enable_gtk_force = xyes; then
++		AC_MSG_ERROR([Aborting since --enable-gtk was used])
++	fi
++	AC_MSG_WARN([Not building razertool-gtk])
++	enable_gtk=no
++])
++fi
++
++dnl i18n
++GETTEXT_PACKAGE=razertool-gtk
++AC_SUBST(GETTEXT_PACKAGE)
++
++ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
++AM_GLIB_GNU_GETTEXT
++
++dnl output
++AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
++
++AC_SUBST(libusb_CFLAGS)
++AC_SUBST(libusb_LIBS)
++AC_SUBST(GTKLIBS_CFLAGS)
++AC_SUBST(GTKLIBS_LIBS)
++
++AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
++
++if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
++AC_MSG_WARN([
++
++*** NOT BUILDING RAZERTOOL-GTK ***
++])
++fi
+diff -Naur razertool-0.0.7.orig/configure.in razertool-0.0.7/configure.in
+--- razertool-0.0.7.orig/configure.in	2006-08-13 21:57:35.000000000 +0200
++++ razertool-0.0.7/configure.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,67 +0,0 @@
+-dnl Process this file with autoconf to produce a configure script.
+-
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(razertool, 0.0.7)
+-AM_CONFIG_HEADER(config.h)
+-AM_MAINTAINER_MODE
+-
+-AC_ARG_ENABLE(gtk,[AS_HELP_STRING([--disable-gtk],[Don\'t build razertool-gtk])],[enable_gtk_force=yes],[enable_gtk_force=no;enable_gtk=yes])
+-
+-dnl checks for programs
+-AC_ISC_POSIX
+-AC_PROG_CC
+-AM_PROG_CC_STDC
+-AC_PROG_RANLIB
+-AC_HEADER_STDC
+-PKG_PROG_PKG_CONFIG
+-
+-dnl checks for libraries
+-PKG_CHECK_MODULES(libusb, [libusb >= 0.1.0])
+-
+-if test x$enable_gtk = xyes; then
+-pkg_modules="gtk+-2.0 >= 2.8.0 librsvg-2.0 >= 2.0.0 cairo >= 1.0.0"
+-PKG_CHECK_MODULES(GTKLIBS,[$pkg_modules],,[
+-	AC_MSG_RESULT([no])
+-	AC_MSG_WARN([
+-Package requirements ($pkg_modules) were not met:
+-
+-$GTKLIBS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTKLIBS_CFLAGS
+-and GTKLIBS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-])
+-	if test x$enable_gtk_force = xyes; then
+-		AC_MSG_ERROR([Aborting since --enable-gtk was used])
+-	fi
+-	AC_MSG_WARN([Not building razertool-gtk])
+-	enable_gtk=no
+-])
+-fi
+-
+-dnl i18n
+-GETTEXT_PACKAGE=razertool-gtk
+-AC_SUBST(GETTEXT_PACKAGE)
+-
+-ALL_LINGUAS=`cat "${srcdir}/po/LINGUAS"`
+-AM_GLIB_GNU_GETTEXT
+-
+-dnl output
+-AM_CONDITIONAL(BUILD_GTK,test x$enable_gtk = xyes)
+-
+-AC_SUBST(libusb_CFLAGS)
+-AC_SUBST(libusb_LIBS)
+-AC_SUBST(GTKLIBS_CFLAGS)
+-AC_SUBST(GTKLIBS_LIBS)
+-
+-AC_OUTPUT([Makefile src/Makefile gtk/Makefile po/Makefile.in])
+-
+-if test x$enable_gtk_force != xyes && test x$enable_gtk != xyes; then
+-AC_MSG_WARN([
+-
+-*** NOT BUILDING RAZERTOOL-GTK ***
+-])
+-fi
+diff -Naur razertool-0.0.7.orig/gtk/Makefile.in razertool-0.0.7/gtk/Makefile.in
+--- razertool-0.0.7.orig/gtk/Makefile.in	2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/gtk/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -40,7 +40,7 @@
+ subdir = gtk
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+diff -Naur razertool-0.0.7.orig/Makefile.in razertool-0.0.7/Makefile.in
+--- razertool-0.0.7.orig/Makefile.in	2007-02-15 07:55:24.000000000 +0100
++++ razertool-0.0.7/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -42,7 +42,7 @@
+ 	mkinstalldirs
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+diff -Naur razertool-0.0.7.orig/missing razertool-0.0.7/missing
+--- razertool-0.0.7.orig/missing	2006-11-27 03:51:30.000000000 +0100
++++ razertool-0.0.7/missing	2022-07-14 13:27:46.765830454 +0200
+@@ -39,7 +39,7 @@
+ if test -f configure.ac; then
+   configure_ac=configure.ac
+ else
+-  configure_ac=configure.in
++  configure_ac=configure.ac
+ fi
+ 
+ msg="missing on your system"
+diff -Naur razertool-0.0.7.orig/src/Makefile.in razertool-0.0.7/src/Makefile.in
+--- razertool-0.0.7.orig/src/Makefile.in	2007-02-15 07:55:23.000000000 +0100
++++ razertool-0.0.7/src/Makefile.in	2022-07-14 13:27:46.765830454 +0200
+@@ -1,5 +1,5 @@
+ # Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# @configure_input@
++# @configure.acput@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+ # 2003, 2004, 2005  Free Software Foundation, Inc.
+@@ -41,7 +41,7 @@
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/app-misc/razertool/files/razertool-0.0.7-rules.patch b/app-misc/razertool/files/razertool-0.0.7-rules.patch
new file mode 100644
index 000000000000..b04357e17029
--- /dev/null
+++ b/app-misc/razertool/files/razertool-0.0.7-rules.patch
@@ -0,0 +1,8 @@
+diff -Naur razertool-0.0.7.orig/razertool.rules.example razertool-0.0.7/razertool.rules.example
+--- razertool-0.0.7.orig/razertool.rules.example	2007-02-15 06:09:41.000000000 +0100
++++ razertool-0.0.7/razertool.rules.example	2022-07-14 13:23:13.519271582 +0200
+@@ -1,2 +1,2 @@
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0101", MODE="0660", GROUP="plugdev"
+-ACTION=="add", BUS=="usb", SYSFS{idVendor}=="1532", SYSFS{idProduct}=="0009", MODE="0660", GROUP="plugdev"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0101", MODE="0660", GROUP="usb"
++SUBSYSTEMS=="usb", ATTRS{idVendor}=="1532", ATTRS{idProduct}=="0009", MODE="0660", GROUP="usb"
diff --git a/app-misc/razertool/razertool-0.0.7-r4.ebuild b/app-misc/razertool/razertool-0.0.7-r5.ebuild
index c4a446040f4f..d650ed16d3ba 100644
--- a/app-misc/razertool/razertool-0.0.7-r4.ebuild
+++ b/app-misc/razertool/razertool-0.0.7-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools desktop
+inherit autotools desktop udev
 
 DESCRIPTION="Unofficial tool for controlling the Razer Copperhead mouse"
 HOMEPAGE="http://razertool.sourceforge.net/"
@@ -16,6 +16,7 @@ IUSE="gtk"
 
 RDEPEND="dev-libs/glib:2
 	virtual/libusb:0
+	virtual/udev
 	gtk? (
 		dev-libs/atk
 		>=gnome-base/librsvg-2.0
@@ -28,20 +29,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
-PATCHES=( "${FILESDIR}"/${P}-ar.patch )
+PATCHES=( "${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-rules.patch )
 
 src_prepare() {
 	default
-
-	sed -i razertool.rules.example \
-		-e 's:ACTION=="add", ::;s:BUS=:SUBSYSTEMS=:;s:SYSFS{:ATTRS{:g' \
-		|| die
-
-	# plugdev group may not exist (created by hal), default to usb
-	sed -i razertool.rules.example \
-		-e 's:plugdev:usb:' \
-		|| die
-
 	eautoreconf
 }
 
@@ -52,8 +44,7 @@ src_configure() {
 src_install() {
 	default
 
-	insinto /lib/udev/rules.d
-	newins razertool.rules.example 90-razertool.rules
+	udev_newrules razertool.rules.example 90-razertool.rules
 
 	# Icon and desktop entry
 	if use gtk; then
@@ -63,6 +54,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	udev_reload
+
 	elog "Razer Copperhead mice need firmware version 6.20 or higher"
 	elog "to work properly. Running ${PN} on mice with older firmwares"
 	elog "might lead to random USB-disconnects."
@@ -72,3 +65,7 @@ pkg_postinst() {
 	elog "   /etc/udev/rules.d/90-razertool.rules"
 	elog "Then unplug and plug in the mouse."
 }
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fe1d1b97f11d..736eb677d544 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc48515d5a55..f1d6ac77a044 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,7 +34,7 @@ DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5ec
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20107 BLAKE2B f01ed187adb245332958ee530aa7c3a8d081c68df8a6e63a0969a5a0654611ea6e503d6d32551f560dfc36b06d3744ae3c13d909b0c7368f1158d4cd7e1e6c61 SHA512 fb4243c9018ff1764a54f1935bac1b18c4a6a5fae8c9b064f072fe27b042e1cff614546d876b660553b2d15609bc43c306792c543f54ec6f902f3892b870fc99
-EBUILD libreoffice-7.3.4.2.ebuild 20278 BLAKE2B e4389705e64299aad8bebb7029a023f07bd11898904508590fd02594a35952b96e282c0d8abcbe1c81f9f67779493431fc2e5a0e23368380626b3aa333e26fdd SHA512 3109f958d924d57392543d9f20f7b1fd1b4cbb02e3df7b4f254607a437c58d17aa22db88104f35a1896836b29b96a7ee1f5e4ff942ba50ea1617a7df1c362036
-EBUILD libreoffice-7.3.9999.ebuild 20001 BLAKE2B ca66a0dedda343d85dbadcaa25cd3938c41e2daff2b9dbf25a397eff51b3e1914bc5ec95fe9da36a650b30969236cacdcd5ef0c123b2d716bae20614e42db28d SHA512 1e9b27cc43d95b34730442a8ab3a1b9bafc5a05ca99b8ea0e81e7c6c2ba241d4f7e794cb615806764fe3b3085081744b58fc5b9a75040a22a714e220f82d857d
-EBUILD libreoffice-9999.ebuild 20004 BLAKE2B c6d988634d81b540cc7e6cbae6334438eb39dfd927183ba184aee35d3c7320f915721cbbe96ba3d0d1e91ab03008f3f4cad0d8c569536954d263ab5960c9507a SHA512 f1881490b3eb93a4296acb45bccc6c0f4c25abd82691999bd8af9ed3204123da3793bf413f37c93a5b2758ce5ad425fc75527cee8cecf311ef82b970baad7c1b
+EBUILD libreoffice-7.3.4.2-r1.ebuild 19726 BLAKE2B 42529270afd4b6ea3b0ce4d08e9eebc49d231f9f5f7b94da350fbb6a9771bafdfce7cffaa0991d885bd293ad1771a1bd7341bfd7fed20c584aeda23bcdfb56f5 SHA512 7e05d914a613cf18828d58e036221bb053de0442e19049865e76788f1bf9161dd6a6ab6d00dadc7351dada4602731849ac544ce7a020d12e76a0dc3cb827ec0b
+EBUILD libreoffice-7.3.9999.ebuild 19441 BLAKE2B 6898da68ce80888663ee1ede0e6f476bf20848f7d741707a0226f1e5ff92a55fb7abbae89067119b587de297db7a81bd96bd5c2cf813f67b0b8e933d61572a68 SHA512 d733cddd2b3c8dc351677aba014ccc57b9f770bce61679e4865964ada7e4c57a8a2fa758c20536214475360b65ad48c604156f43bc0b348c015fbf7fb62d444c
+EBUILD libreoffice-9999.ebuild 19444 BLAKE2B 7a554b6389af43f50e4a8cc6feac0fa855fa0b5e295349e680a2482bd7b572cb27fa1c00d02ef0ee3e1c3db18449e969f4c40b2bb250d02601848ce605a27e49 SHA512 3b36becb71a4614be3e84182a13c6239bda652bbeeda1e661cceb0f847864ddbbffc43e9825844812613409e24d6a02c3dfb152290134bea3a79c2bd2839808f
 MISC metadata.xml 1222 BLAKE2B 02bb2d5bae26c3a97d77a36d90a2ffa0cac1eb2a0aabfac7d7f11d6b685264b7daad1a860598940af0fe9411068830d7eaf8553cbe4f69afedb092669b719cf1 SHA512 4ad197bb97eab3e860ba163b4c63839949fc9280a2ab53abc81ebb6c351d633e65ef3335a2d3af718d0e4a64e3312dfaff58f6cbab55507c57a6663c2850c3fd
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 99329d166bc3..779d228b8167 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+),xml(+)"
 
 MY_PV="${PV/_alpha/.alpha}"
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	!mariadb? ( dev-db/mysql-connector-c:= )
-	pdfimport? ( app-text/poppler:=[cxx] )
+	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
 # FIXME: cppunit should be moved to test conditional
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -320,16 +313,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -573,12 +560,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
-		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 86e77b20eb76..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -568,12 +555,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
-		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cb77e652cea2..b334b35d33ee 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
 	media-libs/openjpeg:=
-	media-libs/zxing-cpp
+	media-libs/zxing-cpp:=
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
 	x11-libs/libXtst
 	java? (
 		dev-java/ant-core
-		|| (
-			dev-java/openjdk:11
-			dev-java/openjdk-bin:11
-		)
+		>=virtual/jdk-11
 	)
 	test? (
 		app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin-debug
 	media-fonts/liberation-fonts
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( || (
-		dev-java/openjdk:11
-		dev-java/openjdk-jre-bin:11
-		>=virtual/jre-1.8
-	) )
+	java? ( >=virtual/jre-11 )
 	kde? ( kde-frameworks/breeze-icons:* )
 "
 BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
 }
 
 pkg_pretend() {
-	if use x86; then
-		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
-		elog "most notably Report Builder in LibreOffice Base, will not be available."
-		elog "See also: https://bugs.gentoo.org/785640"
-	else
-		use base ||
-			ewarn "If you plan to use Base application you must enable USE base."
-		use java ||
-			ewarn "Without USE java, several wizards are not going to be available."
-	fi
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
 
 	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
 }
@@ -568,12 +555,8 @@ src_configure() {
 			--without-junit
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
 		)
-		if has_version "dev-java/openjdk:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
-		elif has_version "dev-java/openjdk-bin:11"; then
-			myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
-		fi
 
 		use libreoffice_extensions_scripting-beanshell && \
 			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a76bbdf57c22..3416ea4220eb 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index 00c1f323f1aa..125c39e639fc 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,9 +1,10 @@
 AUX nim-0.20.0-paths.patch 934 BLAKE2B 6a4e44c5656cde6d5127bf6a6b8db92cdf8aada0892c27d536d0c1030ed7da8dc97138a8941030101918021f2a301fa683169c8a656fefc6fb7d0fcdb24029d4 SHA512 bf8dbc3e3861ec3ea2718092b981e495194ead5b547e69d01d5d842d128dc4b96b0ba3e95c78afd8fd822d594199315a01de370851ed8f594c091231b9a10ee9
+AUX nim-1.6.6-csources-flags.patch 371 BLAKE2B 903e9738f6c87bc40ef922c5abde50edaff223cdf11befee0ece7b3a472a68b7dc211e1e6347a2181c68fe524693832f20309bf90aeb3aac9d76125f224587c9 SHA512 2753e14ada3093a2208636eb36eb2a79946f7c4858d86945b1d242d424b1a4350403b7d8f58af33c1c43a04b24465748cb7f26b7426e65b91d09cc61167d5de4
 DIST nim-1.6.2.tar.xz 5181616 BLAKE2B adedbcaad1b135b6f99459894856190103e2d2b678849e0418f77c02a54fde44224456ea13949f3fe9f5f020a90adde46593497895674bd9ae892b17708df292 SHA512 052b62c987035f7633f965356993cd4eec686f4f4f5c675cf966d82cb30fcf574045887a4402bcc20e487299fb5e8f65a921951c2dc21ac334e695e31d95d992
 DIST nim-1.6.4.tar.xz 5130208 BLAKE2B d0f297581677bbb9fb185a8b4198f48bb58efe81a1624f62051bc1e0a93f879a0cec172f11a41784ca715ba3c151dc5307e96c15c54908aa40df406040891d6c SHA512 f4d082f37f0e675e8cdb4340d67f2e58b5e6ac5bb51dab1ded5417097f3b86d71fa585ef12ee1c3cd5b17285589cbe9d5658fcb29c98547f7967a1b6f0cb4646
 DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
 DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
 EBUILD nim-1.6.2.ebuild 2139 BLAKE2B 9ce2020017887e5403aefd67712ffbf0b4f6c42c7f5ad96eddac2fef3afdafbd6f6264dd27eea2b6968b0dd816d714ccb1a8bf7debed5a338cf7a65c24ce4eb7 SHA512 b910a98baac46d490be0764b79f6438a61e2ed6dfa5f998102bf52ae7dead628a1aabb2e488860c61d6f9eef54f27477797e654a588c4ee8ba67cbe3ef8c13eb
 EBUILD nim-1.6.4.ebuild 2150 BLAKE2B df6e12e923f86d1ae2fd7f97c3d58884aaffae1f6db49f1fe0bda6d4f566716b398f638277697ad3850f8d00bdda1f36508e0740a7c7b1e6cc728b1671db7382 SHA512 5fa6a5df5374ef85198095e08647a3c1bad33ad999eb18458ae593b65f964c30c805488eab360a793a5a0c8ca9df6dba45d000edbbff16d6e19602339f6d3786
-EBUILD nim-1.6.6-r1.ebuild 2509 BLAKE2B 4785006c8934be25036f007982f33725180dbe361b79d76a39afa186574b545a3a4619243db29fb2f38698aee496a31a1dbee533bbb028af3d80c609f668c063 SHA512 e5f398d9da2387b6ad5f24d58cb518141d9b23ec750cbb210ef06fdd4a92b1a3153defbbd493e5fcc77c05efdabd626361139645fef833ba4a69d8ef856e770c
+EBUILD nim-1.6.6-r2.ebuild 2565 BLAKE2B bc888ebb22d8932fb905088d2f8042e0bde6e0e1ff495967d130f3477e6494c392f04b17dea7c49b35eac3c56d5534427e9384b92a365f0539a5c63a452d7bb3 SHA512 6e116b206c24927c30513ee97cd9035952380b1b88bb240ffc8909a1989d0fbba9827685fd4ab759e02077422afdd0cad28028980ffd7ebfef47d11d3c163b16
 MISC metadata.xml 1975 BLAKE2B 892f172a8f69200207ce9f3f9415ec08adddf30e52d975a706c2de75e643a9a7e1e9911340ff9aaf9d74feb8e159172c90ecb7eb75642319afc8a5ab3d04f030 SHA512 69772a1e0469fdd71e28037eb2ecba46b78355a120fbacfb1c520e0e5c6c5a0b68fc5b7b0695f4ca7e682031f68a4350fe8108e97e64eb6b86b49fdc57b07977
diff --git a/dev-lang/nim/files/nim-1.6.6-csources-flags.patch b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
new file mode 100644
index 000000000000..9a39a900e82a
--- /dev/null
+++ b/dev-lang/nim/files/nim-1.6.6-csources-flags.patch
@@ -0,0 +1,11 @@
+--- a/build.sh
++++ b/build.sh
+@@ -60,7 +60,7 @@
+   fi
+   CC="sem -j $parallel --id $$ ${CC}"
+ fi
+-COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -O3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
++COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -fmax-errors=3 -fno-strict-aliasing -fno-ident $extraBuildArgs"
+ LINK_FLAGS="${LDFLAGS:-} "
+ PS4=""
+ # platform detection
diff --git a/dev-lang/nim/nim-1.6.6-r1.ebuild b/dev-lang/nim/nim-1.6.6-r2.ebuild
index 9d4da4f7a23b..79f9edc5c376 100644
--- a/dev-lang/nim/nim-1.6.6-r1.ebuild
+++ b/dev-lang/nim/nim-1.6.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 multiprocessing toolchain-funcs xdg-utils
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
 
 DESCRIPTION="compiled, garbage-collected systems programming language"
 HOMEPAGE="https://nim-lang.org/"
@@ -15,24 +15,16 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug experimental +readline"
+IUSE="debug experimental"
 RESTRICT="test"  # need to sort out depends and numerous failures
 
-RDEPEND="readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}"
+# BDEPEND="sys-process/parallel"
 # BDEPEND="test? ( net-libs/nodejs )"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.20.0-paths.patch )
-
-_run() {
-	einfo "Running: ${@}"
-	PATH="${S}/bin:${PATH}" "${@}" || die "Failed: \"${*}\""
-}
-
-nim_use_enable() {
-	[[ -z "${2}" ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
-	use "${1}" && echo "-d:${2}"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
 
 # Borrowed from nim-utils.eclass (guru overlay).
 nim_gen_config() {
@@ -77,19 +69,28 @@ src_configure() {
 }
 
 src_compile() {
-	_run bash ./build.sh
+	local -x PATH="${S}/bin:${PATH}"
 
-	_run ./bin/nim compile koch
-	_run ./koch boot $(nim_use_enable readline useGnuReadline)
-	_run ./koch tools
+	# Build from C sources
+	# Compiling with sys-process/parallel fails for some reason but hopefully
+	# we'll be able to enable it later...
+	edo bash build.sh  # --parallel "$(makeopts_jobs)"
+
+	edo ./bin/nim compile koch
+	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
+	edo ./koch tools
 }
 
 src_test() {
-	_run ./koch test
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch test
 }
 
 src_install() {
-	_run ./koch install "${ED}"
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
 
 	# "./koch install" installs only "nim" binary
 	# but not the rest
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 0e257c75d68c..78f2654acb73 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 7874039625c2..a39677ef9155 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -21,7 +21,10 @@ DIST sbcl-2.2.4-source.tar.bz2 7030086 BLAKE2B 109886223a500dc54b997bf795d2de57f
 DIST sbcl-2.2.4-x86-64-linux-binary.tar.bz2 10353325 BLAKE2B fe2dbf70a9f644417099d1faae4b6c849fba42d175492edf3e108b59a1054e810e33d8081e27514998c8ec4dc04f6a233ea065e0f805e74e98de4c3b168f80d0 SHA512 4c997f23772344ef12ac9ed583506d29c73071cc77ff33fc10c611f37b52fdcdafa5d647b94ea139ce2ff95c3f492bb5be3236190921670c408d49fd49ad72d5
 DIST sbcl-2.2.5-source.tar.bz2 7029912 BLAKE2B 840a10e4c5e4b758c2b97b5f95d114eccc67f9a5ab24b137aabbdcd70ae4108bc7bfbc9fc06a474e5b65a6e57eec35b8714934d590da88fb7a80f314cad75c84 SHA512 9d581535348bb709ca1f7edbe5ad92f079fd1cbc9a462524220fb229bd78770f7855c0b1a8641b990a1d663fb559edc0c2ca0f029281d4b0c80a5917b45d7b72
 DIST sbcl-2.2.5-x86-64-linux-binary.tar.bz2 10706829 BLAKE2B 0cabe57fcfa80f07abb0a55b1e928111cbc4296dc57b45e8fc714b7f0d8e656736aa0c7bc000fe0ec8d4c2acf9c54c872f3369155aa9c36b55ee035b66a21f6f SHA512 7e4a4c2c825f906b5c90fe3f0129115361056c57d524ff0f5a9fbae611f98b1b6488711269eee3c6eeb22793c5c35087a02ce925e3ca8d84445d061e56f5e6fc
+DIST sbcl-2.2.6-source.tar.bz2 7128448 BLAKE2B 7b7c996c175e9a06ca3b1cc40834d8d97925d3d6aa431fff4278ebe2b23e2ce8888824f71b1b5b47211b6acd006996a40391cb12004c92fbf3fb08d6fbb5b28f SHA512 d8460cfb0044b02b3989ff2266355c067035eab5cde2afb8d170870e4bf54112ec878e7d5f809adaaabcfef3df1cd9ef2d94517b772ba376ca53b9ee78893baf
+DIST sbcl-2.2.6-x86-64-linux-binary.tar.bz2 11670931 BLAKE2B b878bed6f948dfdedb10a755887da386dbdf8b8c69d9a0051c7fd1bbba0cf30c87b7863f424cb744eb4d1d5482158f96cfb9000b84bbad208619fa875593c9b1 SHA512 22a14422dc5ec06501471b741ccca1d9a03f6061ccdb2175c75eb452cff3edf561e6804660ca179d269642e09854268fd4f158834c17e39ec95e568f26a2eeaa
 EBUILD sbcl-2.2.0.ebuild 8344 BLAKE2B 1baa54b857fd84c98ca24cde84b6595a9b4d58df52205e41620b2bf028b40af77d3f50ba43b82949fd9c86c4e75653c080ee031b1be29bb3c50543b0b49fef72 SHA512 644db987685fbeb15e5eac754ac15138958c09fe657be8838ab18f9df336f3b86b0f34003a74c43a3d32248bf7dfed1752cdb302abf85fa882fefc46bbf92a07
 EBUILD sbcl-2.2.4.ebuild 8348 BLAKE2B 7b9e59319afe101fc90a10a06ced781468f41e995abc5857456787d31fd7e0770de38ebd6d2dbcaa3e24eb56f3fc0d618bc6034f220e4728dae09db35954f964 SHA512 f481b9c72ed0d9f448c6e951cb3c7b22afbc471b17c6c9c70fb73a98b666a4240dec6ac55a7745a02515b7f984b2dca60f732d380c6aa9f84aad7b0db0024439
 EBUILD sbcl-2.2.5.ebuild 8348 BLAKE2B 7acf637cd8226227f07492781fc1f85e713e0d2c3b88c19a6607e86e75861398cc0db26b6a0c69ba4075be33a8c1f43b4460ef250bc25d12cdcb66dd0d0fff23 SHA512 6dfb627e3991d5527b231629ece7256d846f55601a9df912ccc0fd5f2f3d0e63fc471ddedc71bda8c0a8fbba2b8341076dba38ec338f10c700d208d2c6250464
+EBUILD sbcl-2.2.6.ebuild 8348 BLAKE2B 1be45824663f04744a248b0547e4f13ee50d2b4ab2d1113feea8239dd8a966b106974d423dc7dc60223e44d81841e173add1382b7962b9bb57f8e299c5835b41 SHA512 9539e8ca476723480007dbaa885007c19ca29296bed2bd945e5219d3dba03ebd85b805656b031687d142c5e8ba840b06c5d034d0bba7661fcf35fbff1404de7d
 MISC metadata.xml 1185 BLAKE2B fa1ce4556cb77fa154914a28fdd2e5dcec45498961875461f465978de4467ff16a329bfdd8a0fe161ba579639808b48af76bcd6fd22165a73d803983e6c10c91 SHA512 51bda1487ee9f95ba0e343f2990f465524590a88baba942819339697b446db3c7054d08791579c77472654f69e3f0fed8077ef2f0a9cb2314067fceff4c2c67c
diff --git a/dev-lisp/sbcl/sbcl-2.2.6.ebuild b/dev-lisp/sbcl/sbcl-2.2.6.ebuild
new file mode 100644
index 000000000000..c9bb695cea01
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-2.2.6.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib flag-o-matic pax-utils toolchain-funcs
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.2.6
+BV_PPC=1.2.7
+BV_PPC64LE=1.5.8
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.4.11
+BV_ARM64=1.4.2
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.3:="
+BDEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-2.0.1.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+	# bug #767742
+	eapply "${FILESDIR}"/etags-2.1.0.patch
+
+	eapply "${FILESDIR}"/verbose-build-2.0.3.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+		for d in contrib/*/; do
+			cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die
+		done
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 8a176b7a03ad..e5fa0d3510a1 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 841dba9147a6..278fe2aafb30 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -3,5 +3,5 @@ AUX gnustep-base-1.27.0-icu68.patch 875 BLAKE2B d622e9ee420a626f306b90239a239515
 DIST gnustep-base-1.27.0.tar.gz 4141163 BLAKE2B b27f7086949bcd5e43b8d6337c4f03eb87447baacb23de75b7df0d2ba769ff3e8cadd7035e78b35c91ccca83151cbe4b61b339aa265dcb53847089849b615f8b SHA512 bbdf45379dbb684f6bdb507b645e0f611cefb05caadff1bf620c2e85f104396cf91782bcce05ff2173078603b76b8a0ba2ea3b71bc56a84c220310910dbcb705
 DIST gnustep-base-1.28.0.tar.gz 4246622 BLAKE2B fdaa834ea3cb13b1d4717c2c7e6b59eff05d16e6a404ffed5f4ccfa2ee3db93ecfee5b95cc30be6a388f56fa28c67f1278ea298f222260dcc24abadaa1cb5e8f SHA512 e173fab28aa1b1df38de4216916db18934422a1d372b9fe6a68a6ff21b2ac0be38aa02631179a8ad62a4f2848080223f34771b364b1c0eebc96c84778677c50b
 EBUILD gnustep-base-1.27.0-r1.ebuild 2015 BLAKE2B 61fcc154d228ee5eb2d7d6038721ee348f9c2f8894902c970831ebc3ddb463e7395eda9bc086e7e9422c75f196d05cf8c552cc7ae4e1109cc6984bb5d61eec99 SHA512 a0280e17fcc21f408ec8e86ae9255681bbf3f1f206a338065846098d7d107db83d6aad4b67ed9b7ac94f6c034fe16c9c78b9a8f73e6fff41293fa1cc7f6655af
-EBUILD gnustep-base-1.28.0-r1.ebuild 1987 BLAKE2B cd41c21027669f1896081fa3d971fd580322091ccc3b2caf9d3cf07bbdd4c44197cda9b86032854894ffdaa8dd3f90caa44bd8388776b04bf83de0e6ac65be90 SHA512 e51ae09d951cbee436a22084f6a58a2b68af14a0d57e78c1dd83d891d3ed8793665689fd437d672754a034a9726d16f231fcc465ad0518b849c717594a96220b
+EBUILD gnustep-base-1.28.0-r1.ebuild 2061 BLAKE2B 42c3a66633df78100e61a39b98fd4e52656cd9e0052655c7110aafce99f408cab8f91661231632b7f3f6ef24cb6081602faf77e76c3ba3de6e3ccea973a3d9de SHA512 ac245bb3138dadeb852c1a2f0104931316cc7dcc6b7feefb652e0065e54ddbe7b0cfa09b695e4707d5e0fd05bb4584548cef54d49aeb48392e133bee7df4432a
 MISC metadata.xml 764 BLAKE2B c06e433d8900af16d4044465c1576d7ba4aadc3dd44d96a70f5e2d523008518506d754a72a05d6993546d19df7653c62012b6935b41abeb3b1936311e070a5ad SHA512 8d0e798c01bb9ca747d75e64497e4db478a66950001eba8deaad2425ac40927d13a791227d7a4b9b6fabd045c6fe6df042ff3e6625c754c93d555799030350bb
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
index 8a246c6ba767..13d4cb7f7860 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.28.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,12 @@ SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
+IUSE="+gnutls +iconv +icu +libffi zeroconf"
 
 RDEPEND="${GNUSTEP_CORE_DEPEND}
 	>=gnustep-base/gnustep-make-2.6.0
 	gnutls? ( net-libs/gnutls:= )
+	iconv? ( virtual/libiconv )
 	icu? ( >=dev-libs/icu-49.0:= )
 	!libffi? ( dev-libs/ffcall
 		gnustep-base/gnustep-make[-native-exceptions] )
@@ -43,6 +44,7 @@ src_configure() {
 	fi
 
 	myconf="$myconf $(use_enable gnutls tls)"
+	myconf="$myconf $(use_enable iconv)"
 	myconf="$myconf $(use_enable icu)"
 	myconf="$myconf $(use_enable zeroconf)"
 	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 4793703594f7..01be2e5defd9 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -1,7 +1,8 @@
 AUX gnustep-5.csh 348 BLAKE2B 5a53bd83fffbba5db434c90c1b527cf32697b87ad51bf4abdaf09a843a211c4c52b81c2d2d65772847f1d5eb16e82a2561b6d24fde1efb7709766315261e8a9c SHA512 6345bd8559ead4e8433f9e7d3f85412b4cd155188a8daffb6c99c00257c1a5af89fd492fde53e819b887be19f4ebbdb09ae74428fe492c39256a6b476f073209
 AUX gnustep-5.sh 359 BLAKE2B 2df675c570e6343b3303cb3c82e0eb6c6fe60f842fe61297b147acca485df93b8a5a5ecc235b0e3a9854c0fb25cb06c2fcac34ee75933157fc8c230ac94ca843 SHA512 ceb39b583e7583bc6715723878eff1c06685b4786c9607f3ef581ef230a755efd80c7b18202458d4af54bac01c0ff2f5cec443d8c87639c6cdffc7604bb07700
+AUX gnustep-make-2.9.0-no_compress_man_pages.patch 2216 BLAKE2B 7cf3ccc8e0587c5f06df6410252023b7913b32a1977f87c71dc649d830d3564bb0a617090c8e6db71de2ecedb03eae9b034b0a82ac6a703255fcb83cd228a58a SHA512 e986d0bba2f89cc6152ec399b08ca5c23721329e43222dcfd5e1283ae8bf45048a5033d1a3ecdf1eb48293418fec7e21ccea459e19340ce4e09f7e6127448e77
 DIST gnustep-make-2.8.0.tar.gz 606337 BLAKE2B b4defb8fdd8fc17ce2ac14c7d3d63b85e817bb639b7c1ae6a150baf74cda222ac046d890e677b50398bb9953e1496a98e9eb542809c961243f4f620276ab13fb SHA512 e9e57ed7a1c360c2dbf17f70d38e5107a1a9613842dcc645f10ed7a01eb9f9ee71bd2d0cacbe00439ce73f194a3eb3ed2e71409241ac96ee3bba704dcf6dfd7b
 DIST gnustep-make-2.9.0.tar.gz 611406 BLAKE2B 73bae19b5d3d3c1e069d22ce7087308166f632277d870fa5ab125d5bc004a1518a1edb6822c61e00b98fc13a1b3354440024bd13d98662002c15298745c4e935 SHA512 ff185affe32d4efc2009d72a3862bc3bffebce05ea5a7fdfbf4372774e57b6654863e317ce648c248716dd3e97a4320d697a313e7eefd04f5723186be6cbf1e3
 EBUILD gnustep-make-2.8.0.ebuild 3669 BLAKE2B 3e138297504eb90c7a232bef734000e46bead1f3fe2d335a768f27497450c56cb81a20b942b25c1e44bd5c3edc3d040431570eef927e5010d90e4369dc5bdc40 SHA512 1ca02c3d8046baf58df51f9a771cbffb87ace3067d8c9ba1e7a034ee513ef867038051ec35ab05a9038c16b70a9fe9efb3b871bc4eb3e9cc78649d901a062859
-EBUILD gnustep-make-2.9.0.ebuild 3674 BLAKE2B a4edce5131553665613df39de98182598cb871605540781f6219cf310a3b7e7de5a5b411a9033257b906b430f7f00771156f0829b57f37c815ccadb1ee2a7291 SHA512 6d2e44d29f3ef244a01d9d8d2be2a7ae7ae28142fe04ec578d956a7ba631a84f7b381530f863a51731686d5c7ccfa47d9d9f1f0e25a46091e789c5b556c538d7
+EBUILD gnustep-make-2.9.0.ebuild 3734 BLAKE2B c22f08fa0cf3a2226fdcc929115759f2bb9e39ee8058bf4bc898eca73f94dfb21508628b7f5b3a47aa98e652a9fe95ce109f8b9b1c3b39cd5121f0c7494bf3ed SHA512 91f73b5010c29a1fb3514b8ddfdd0282b90c8c29e515331fbe0ae5fd64a9963e11f71459a86afc618f69fb417eaa725474b95f5f4cffbceb84577b02c0da2a77
 MISC metadata.xml 992 BLAKE2B 9080bcf4934cee4e7f6efe7a7875a830e5a693a2174a1eb8d1134fd5fb8f17e8962e47f151cfa7b080af1734dcc9f2e1b8ce4fd7532d91ede58409449e803274 SHA512 746eaa9497ea688ac9549dc0f14693f34bde4906c8df9a5e6e3a863b98c18e965bd1943effaa637eace6cf05adfae11ad376c2fd7b738a8e2563dd51b60b6641
diff --git a/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
new file mode 100644
index 000000000000..c013ce3a282c
--- /dev/null
+++ b/gnustep-base/gnustep-make/files/gnustep-make-2.9.0-no_compress_man_pages.patch
@@ -0,0 +1,29 @@
+diff -Naur gnustep-make-2.9.0.orig/GNUmakefile.in gnustep-make-2.9.0/GNUmakefile.in
+--- gnustep-make-2.9.0.orig/GNUmakefile.in	2021-03-21 22:56:13.000000000 +0100
++++ gnustep-make-2.9.0/GNUmakefile.in	2022-07-14 14:21:10.545943581 +0200
+@@ -255,23 +255,16 @@
+ 	   for f in $(TEST_FRAMEWORK_FILES); do \
+ 	     $(INSTALL_DATA) "$(srcdir)/TestFramework/$$f" "$(testdir)"; \
+ 	   done)
+-	$(EC)(echo "Installing (and compressing) manpages"; \
++	$(EC)(echo "Installing manpages"; \
+ 	  "$(srcdir)/mkinstalldirs" "$(mandir)/man1" \
+ 	                          "$(mandir)/man7"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/debugapp.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/debugapp.1.gz" && gzip -9 -n "$(mandir)/man1/debugapp.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-config.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/gnustep-config.1.gz" && gzip -9 -n "$(mandir)/man1/gnustep-config.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/gnustep-tests.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/gnustep-tests.1.gz" && gzip -9 -n "$(mandir)/man1/gnustep-tests.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/openapp.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/openapp.1.gz" && gzip -9 -n "$(mandir)/man1/openapp.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/opentool.1" "$(mandir)/man1"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man1/opentool.1.gz" && gzip -9 -n "$(mandir)/man1/opentool.1"; \
+ 	  $(INSTALL_DATA) "$(srcdir)/Documentation/GNUstep.7" "$(mandir)/man7"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man7/GNUstep.7.gz" && gzip -9 -n "$(mandir)/man7/GNUstep.7"; \
+-	  $(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7" "$(mandir)/man7"; \
+-	  which gzip > /dev/null 2>&1 && rm -f "$(mandir)/man7/library-combo.7.gz" && gzip -9 -n "$(mandir)/man7/library-combo.7")
++	  $(INSTALL_DATA) "$(srcdir)/Documentation/library-combo.7" "$(mandir)/man7";)
+ 	$(EC)(if [ "@GNUSTEP_STRIP_MAKEFILES@" = "strip" ]; then \
+ 	   echo "Stripping makefiles and shell scripts..."; \
+ 	   cd "$(makedir)"; ./strip_makefiles.sh; \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
index 3657bdcd66fa..d50df165f623 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,8 @@ DEPEND="${GNUSTEP_CORE_DEPEND}
 		) )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-no_compress_man_pages.patch )
+
 pkg_setup() {
 	# Determine libobjc.so to use
 	if use libobjc2; then
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
index 6da86f08eb99..e9519d0d9799 100644
--- a/gnustep-base/gnustep-updater/Manifest
+++ b/gnustep-base/gnustep-updater/Manifest
@@ -1,3 +1,3 @@
 DIST gnustep-updater-0.3.tar.bz2 3685 BLAKE2B df4d4e54243e0ffaa2ba28c71eefb7107b1cec59574f69ba4587a76a759d33d68c4d06250160b97814ef2c00e6e628664c30c760ad1fc3c9ac0c035451b5520a SHA512 079b51c54a7860c4eea65ffc63172ea69e88de4a34f2ca0d0c5ad3a1342ea37ee69edb107f287f04d33c3ee03658edd5386d1323f47e9bc201bc70d68d0c9c4b
-EBUILD gnustep-updater-0.3-r1.ebuild 585 BLAKE2B 6ac357b7e24d67460399ae725bf4afbe7dc111efad38aad0ddd64b7d33aed570f2c12d1dc132f6356609e6e2c902ec483ac7326b1345c983310838874c7bc915 SHA512 a244e13fa093a405ff7dc6b3bb43e5d4b93ef85936441e7a56aeeeda28e5de434f663c0ea73fccecd0719a0f7b8026e9bf7fa08772fff84b3c4d18434b281575
+EBUILD gnustep-updater-0.3-r1.ebuild 707 BLAKE2B 2b3a01c52eda0ea08f9e7d3a489f3906a99255c9c1503de3eabfe74bcef016e387ed846c87195f18a26627bc60b4482965ba9eef36b75acd2bc4fbae43bfd431 SHA512 939b3916c97b9b6e8e23401649d3cd09c858d2847d4adae107c3476ab4f32c78ea8c8461dc2aeeb8b2171e4dfe20070577c9eaa5400a12b73f90040121e546ea
 MISC metadata.xml 258 BLAKE2B 2d5066672e93f52c887e0733cf4d05470fafb0128f75c44259fd046360f67f2d9571ddd143a8f6352477c39bacd8fcf6e1d8b6554b623a64fa230d4f3ed90653 SHA512 490a494189a1a1826ef34c2997b7032f80527568f07eecd4aabcc343aa8c7c142ea5423e1f874f288177aee6058e5342ae5805b644e15be12fa8bb280a43e905
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
index c03c159ce0b4..fdf837fd0ec1 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,13 @@ RDEPEND="app-misc/pax-utils
 	>=gnustep-base/gnustep-make-2.6.0"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	sed -e "s#/etc/init.d/functions.sh#/lib/gentoo/functions.sh#" \
+		-i gnustep-updater || die
+}
+
 src_install() {
 	dosbin gnustep-updater
 	doman gnustep-updater.1
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 8e1598cc3fa3..151110c0d5d7 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index e348f5f33cac..8a678166bda6 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-21.12.3.ebuild 904 BLAKE2B 9d7b2a1de07751478026d3ea490f03fe423a5d0d2c48a65eccb128cca0e00b3a19f184b72f28402be3c15ca4261990c1ec61df012755c1de322f1009ad4095ad SHA512 be0dd3b843708e693cae4e4512f58ce1b255664cb43c456e2944a7de7a0e26f9d3c575514ef775fbc6d4a1b6284ffa2f16a600dfce0a09b26dfcfa4f40aef842
-EBUILD kdenetwork-meta-22.04.3.ebuild 907 BLAKE2B 07e1e6b1f5b6a59a88ed2361ff2de262532ab35ca6546343b272e396566ffba3f3e95abfb889c212452f2de5b55007315eb7faa1017de43afe42ed683fd0a94f SHA512 60e399f034067bf345f6765ad646bac62575c47a0bc5fa3403ac1263b226a4f4c47962e07a9fe007456b4c13f15a2b9bd644cad32993b40ee27d923abbc09df8
+EBUILD kdenetwork-meta-22.04.3-r1.ebuild 906 BLAKE2B d86fa6ab56fc9bd4eed6c7ce06a262afd06ab0fac5d667b3eb767378586a4c906e530930a25de4519ec9f01712056254962f72da37bb8fab89b437f11379e4d8 SHA512 092a5c73dc7cb660a41954b0eb14685c09451ce9bbab502f5e8a95728ce6a6474310356b96dee21c609041ca382c500d851b394c3341de97f226380035cce4dd
 MISC metadata.xml 835 BLAKE2B bae1ffe0702c7f4de6e13b52e5da9bde0a57c284f4136368986d34b54ac2628b5e3c13435b7360e34b698e371ad66acd83de6db3bd1962c9fe4d9b6210116c24 SHA512 c4736229321f0494f5b898a03750792c0f87001a5a6b6751e1aabf5291c67165305c094459d37b0cefc5a30dfe425d07412bf215e4909d96a12b7523fe21e36f
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-22.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-22.04.3-r1.ebuild
index ec4fa76d2db3..f0aa882e81dd 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-22.04.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-22.04.3-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://kde.org/"
 LICENSE="metapackage"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+bittorrent dropbox samba +webengine"
+IUSE="+bittorrent dropbox samba webengine"
 
 RDEPEND="
 	>=kde-apps/kget-${PV}:${SLOT}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index a6c48bdea370..3e59788f6324 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index ce5362bf4908..897f0453347d 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -3,7 +3,8 @@ DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01
 DIST plasma-desktop-5.24.6.tar.xz 6246924 BLAKE2B dff70688c684437eddbf74ba8487be6de3d71591ef1644841d8da11e05eb00a97d96500caeac4744d8bb6a00f7ab14d16f45c59aed10bc85ba78d0fb254e0873 SHA512 5a9324473fbb78b804c2311c223e97f66a0a00a91848818de47eb92167af6e86db22c4323a9709642a4fc58818c2a451b2afebeda35c203ad8136f119fa40023
 DIST plasma-desktop-5.25.3.tar.xz 6300620 BLAKE2B 52df17bae22fcd12f7aa0c93663a309483dccfe17fc8925094988fdc6e280dad478d5c69d9737638d2e579291e49980ddd3710b0e89cb6700507540d6c478018 SHA512 d0540fab9d04849d8191bb5d6855be12f01610cbf678aa996807e98cbf579c96094cdd6c59a91c0e3d04cea51755aacbdb81d93452c0d3813a96531e960698d4
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
+DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a
 EBUILD plasma-desktop-5.24.5.ebuild 5232 BLAKE2B 2b5f6823524a5a773cd52267c4509010078e9647d6d5f4aa2d7f1c192b39eef46bc777ce945aec0d8cad1edb5744e038173037518845dd61bac12975bdf62960 SHA512 6898851213ef2fefc9904f553984e0742c5dea571821f434c22e883b8a5fb6514a8d3398c1beef262cb60a84649bb78b3da0756ab1ca127c17aabb61294bda3e
-EBUILD plasma-desktop-5.24.6.ebuild 5202 BLAKE2B 6aefa5b8daf0d8ab2acf327357a358842cce4ccf76c950371d50104ca7f594021b32e46c02d3f8618e8e03101f99d9249c0f7bde4aa9329e8d07bc88fe9c48bf SHA512 362730a631789abdbe556ab861a2a1c5e70c92e14e55459a5d43e115730b00d8bfa098699a2b2303fa19e62c704cc61be7c6c422dcbdf02612f9e36bf97e72c5
-EBUILD plasma-desktop-5.25.3.ebuild 5202 BLAKE2B 8338ae9548e817bab47385f93bb9fd3c5e0a6ffb2fcf05179988814cfcef123a48c7b50daa85cbc24c5778aa1743cbb73fda9f374355e9d453b3d4b0e3916db0 SHA512 a9a7cb6c62d612a88d889a8f6c37a8a07603a46787971394f94eba9430e7d9b12f3c017b385867607eac4fbd799983f7824dba71b6c667ab6d41756954f9aba4
+EBUILD plasma-desktop-5.24.6-r1.ebuild 5215 BLAKE2B 79b94905a2730ab2b7d8b8f47c4b58da8bd5ae5e076c67ecd20d5e7a4296020c78ae0834823ad4c02e23eead2942be20234628e0d157bcf3d69ad84b398332ce SHA512 e7773288363817173d7eee96440991756a1ee7f6561cdd1ec860cc39af39f144994fa69dc355fd0ef38680eaa993d65c7f1623408fa9ee6af68e75ae7b0d2066
+EBUILD plasma-desktop-5.25.3-r1.ebuild 5215 BLAKE2B 01e1822a2eaf6eea3122ef571338fb01f77d9cc1a5f1f130dc673f2f291cf2ea2d9d896af18496dc5ea151a8f81563dada9734493d6c29ff1a111bd97b513a4d SHA512 e8545e7a8a0aa8ed74bee801758be0888b7cad77a18af7bc911a6a2da65b9d419c6f1b65401a3028ae8719a4f9860e6b1d4d00078e424fa7c002a00eb29d0a2a
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
index 21f1c6a12638..2b1b9f590796 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.6.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.6-r1.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm plasma.kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
+XORGHDRS="${PN}-override-include-dirs-2"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
@@ -119,7 +119,7 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
 )
 
 src_prepare() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.25.3-r1.ebuild
index 7cf9409a14ce..7cc313064b6b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.25.3-r1.ebuild
@@ -12,7 +12,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm plasma.kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
+XORGHDRS="${PN}-override-include-dirs-2"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
@@ -119,7 +119,7 @@ RDEPEND="${COMMON_DEPEND}
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${WORKDIR}/${XORGHDRS}/${PN}-5.24.6-override-include-dirs.patch" # downstream patch
 )
 
 src_prepare() {
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index c57c46130425..9c4e8cd558df 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/zxing-cpp/Manifest b/media-libs/zxing-cpp/Manifest
index 03480b393ccb..bb7393176c2a 100644
--- a/media-libs/zxing-cpp/Manifest
+++ b/media-libs/zxing-cpp/Manifest
@@ -1,3 +1,6 @@
+AUX zxing-cpp-1.4.0-install-required-private-headers.patch 1473 BLAKE2B 8e2445934b118bdaf85b7567ee93fcf370d9e93ae23c2cb35a91e0c32ece380dcde92a0b34b9069805edf96a5f74ad5b20ffc4d8395f6084ed5bae14b961822d SHA512 98a8beaa4fafbc454663b9e8e3553e3859d6639f10a314eb7d668351a247222fb09636a36c68c32de8ffdc283dd3f92ec17cc706a9848099d20e74349d08cb0f
 DIST zxing-cpp-1.3.0.tar.gz 97938087 BLAKE2B f0c9c906ab2b534c67cf66605eca0ecc22a90fc9d69e23397bcb0bc8eaf3d68a7ad41631ea6d9c7f292ee03165d2e038d84f497307384205e2d6f37fef5dddba SHA512 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8
+DIST zxing-cpp-1.4.0.tar.gz 1018225 BLAKE2B 98b6badfe0ddfa39650eb4fbfc02bc01f5237cdd5edfafd7b88067997a22caa2e64d067328b534c439d7d89fef5b6d48acf4bc29389142b332123b477f3e3dde SHA512 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad
 EBUILD zxing-cpp-1.3.0.ebuild 674 BLAKE2B beb366970d86e34a60eb7c156f62a43c251b167db59c85964258b57f68e49f08efa1cd97692607b2c63b295f7a666f3a60c60fafff0e84db77c0c5dc953599bf SHA512 0b064d67c9b1e3bf25059e906fae8e573300da28b2ee5d3b45ee9be33d13d1b8d690d596cd61b185083932aa122f8683120fdb8c2796b2ae3004d6721ba691e8
+EBUILD zxing-cpp-1.4.0.ebuild 883 BLAKE2B bca217aa2db0fcdc8673c64f5d89ed1a43366023c2c35eee331f903381538456961e3023c4ca1c268d8ec5db48bab2c7922646446ab38d051687b7a7e3048281 SHA512 ff22b030384277a0e806b4d569ae2ded4a55e3996ec03e2033baa469bed3c7853d9ba84f230d6ae09f14eb73afab42b485d05c01ab2d901266ee4bbc2f318540
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
new file mode 100644
index 000000000000..2a85252f5439
--- /dev/null
+++ b/media-libs/zxing-cpp/files/zxing-cpp-1.4.0-install-required-private-headers.patch
@@ -0,0 +1,43 @@
+From 4159a44bdc785b27013bc6be1d32b2e442c73b74 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Jul 2022 12:04:27 +0200
+Subject: [PATCH] Add INSTALL_PRIVATE_HEADERS switch to unbreak LibreOffice
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt      | 1 +
+ core/CMakeLists.txt | 6 ++++++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e947ce8d..2e41e773 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ option (BUILD_BLACKBOX_TESTS "Build the black box reader/writer tests" OFF)
+ option (BUILD_UNIT_TESTS "Build the unit tests (don't enable for production builds)" OFF)
+ option (BUILD_PYTHON_MODULE "Build the python module" OFF)
+ set(BUILD_DEPENDENCIES "AUTO" CACHE STRING "Fetch from github or use locally installed (AUTO/GITHUB/LOCAL)")
++option (INSTALL_PRIVATE_HEADERS "Install (some) private headers to unbreak (some) revdeps broken by 1.4.0 cleanup" OFF)
+ 
+ if (WIN32)
+     option (BUILD_SHARED_LIBS "Build and link as shared library" OFF)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 7382bcae..575e696b 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -174,6 +174,12 @@ if (BUILD_WRITERS)
+     )
+ endif()
+ # end of public header set
++if (INSTALL_PRIVATE_HEADERS)
++    set (PUBLIC_HEADERS ${PUBLIC_HEADERS}
++        src/BitArray.h
++    )
++endif()
++# end of 'private' public header set
+ 
+ set (AZTEC_FILES
+ )
+-- 
+2.35.1
+
diff --git a/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
new file mode 100644
index 000000000000..7fe3f592a74c
--- /dev/null
+++ b/media-libs/zxing-cpp/zxing-cpp-1.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
+HOMEPAGE="https://github.com/nu-book/zxing-cpp"
+SRC_URI="https://github.com/nu-book/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/1.4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# Downstream patch until revdeps like LibreOffice are fixed
+PATCHES=( "${FILESDIR}/${P}-install-required-private-headers.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_PRIVATE_HEADERS=ON # required by LibreOffice as of 7.3.5.1
+		-DBUILD_EXAMPLES=OFF # nothing is installed
+		-DBUILD_BLACKBOX_TESTS=OFF # FIXME: FetchContent.cmake module usage
+		-DBUILD_UNIT_TESTS=OFF # for both tests options. no thanks. bug #793173
+	)
+	cmake_src_configure
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 2ba7b985a864..ed6dfbe78e60 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 96d41769f084..b4281bef6aa8 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,4 +1,5 @@
 AUX kodi-19.1-fmt-8.patch 875 BLAKE2B 12899b05bc5c79bd6dd9871d45065142848507bdf928dca12a1fff483611df1d924f1a386881232fbdd67eb303e627f41b331b8ce769325731dbbd4b63a0d4ab SHA512 bb54aa79a497d6d13f88ae9d1e530628eecc1b57deba9c4a404c2b5595f5ccc0c0069ce728a34df08ffbcac984713442091bb63bcdb06adacf7dc05965001e58
+AUX kodi-19.4-fmt-9.patch 2455 BLAKE2B 02ade8fe11dc19850814b01dd77db9f8f58aa2b9fac56d525c0fcd6e1235fdb3bee251835e6ddb78579e0fd1568f9c1284cbae356188d6998b6aed062f3089d1 SHA512 be32a2413b69b3c1bbc053a328c07bb8b42d84a58a22b0d84da6b0d50cf6d3cb29a509ebb808b4f9e1b3f1bc89ee6aa36dd5ee5685597102c3855aa27dfa724e
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
@@ -18,6 +19,7 @@ EBUILD kodi-19.1-r2.ebuild 10980 BLAKE2B 51df21a2bc5577199c3d00e76b7b1fbf6faddac
 EBUILD kodi-19.2-r1.ebuild 10967 BLAKE2B aa98be2ffb033153dde9768f69ebbd48f8b283e72f1a938ee4a5bfdb23f2dbaf1db705bd8021054e49dfd5690fc140da72b14479d92d9a7c6af6f78c0b74a70d SHA512 8a3d87bf7de71a21a6cd43148761b609dce52e7467ffb6515a4952ef16e4ed5cf4a04fd0b8e8b4f30ab32912d49ac9c2db0a739a9014617d38b23b0464173752
 EBUILD kodi-19.3-r1.ebuild 10970 BLAKE2B f735aa870b97d620016d7add3d6be68dfa2714e592e59f9cad49d4c9df820468774468d612bffa46428220742a7d26ca4338e165be841f668a45bc98117af77a SHA512 3888c3b014ff78ccb637975271bb4efb9b2851720280c57a6d9bfb12b669e73ccf0f2a82c43346e9fb08d115fbe92bcd34bf31e405d222d80b23bf2888f733df
 EBUILD kodi-19.4-r1.ebuild 10934 BLAKE2B 66b014a8bbdd750529d7ee8e8d254b67f550723f6fd4f3cc37255f4d7ddd996530d298999d5e238defb3988c387df2e1c70ac953fbd78fae7ebc35cedbcd68f7 SHA512 49134ccbd9c5380937c4b1f4aaf32c48bd8883c46386dcede2591a26a82e7c57a624c83134f5f3e3dba7ef6d78518734f4656bf705ab8ad543c806f729677a96
+EBUILD kodi-19.4-r2.ebuild 10979 BLAKE2B 881c19c548776b470a962255ca031dbb1573810900dd9c483eb9aa4e05ed7586c5f02afda003ded2010143dbbdf4beabd479c296fbe15485a6666a6b207335a5 SHA512 8210c96f4f3f21b5ca3e7c31280ff716639e728e2578ee804640a3424edf386b9d67ac30d3fd987e0c1733153b334d2a4623bd5e420d716f670ab1d0c5153557
 EBUILD kodi-19.4.ebuild 10967 BLAKE2B 01e1c3aa3e02faafade8b8f176abaf1bc7172acbdbcf58427b795e15d9363fe8ca21318b47542b7504714ad415021b8c9a18b1a292ac08482846531c14a57ce8 SHA512 7a540cead57d86de11abcbc11e5b4eeb8055bbae740a697920ac279582f4bb3be6a39b5b173e45151907b910ba8bbb47bb3b36e8045e3055a644fb9fed70a5f8
 EBUILD kodi-19.9999.ebuild 10934 BLAKE2B 66b014a8bbdd750529d7ee8e8d254b67f550723f6fd4f3cc37255f4d7ddd996530d298999d5e238defb3988c387df2e1c70ac953fbd78fae7ebc35cedbcd68f7 SHA512 49134ccbd9c5380937c4b1f4aaf32c48bd8883c46386dcede2591a26a82e7c57a624c83134f5f3e3dba7ef6d78518734f4656bf705ab8ad543c806f729677a96
 EBUILD kodi-9999.ebuild 11000 BLAKE2B c362b18d245a3bfc02dec05c7edfdcdee101f12801ad4cbf1af1818de30d538d44dd34fe769aa6b09a05ddd457a3d43b5a510a1fba3e92733932f77856ee577f SHA512 8c03b0055d58750de3bdd99b4096ae27eeaa4764733de7725ffb4ce1baf896057841934f9795a8e03afe48cbf24cb9353a934ab5aa9b33a142f9dd1a9d5873ec
diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
new file mode 100644
index 000000000000..b60d9ccc93aa
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
@@ -0,0 +1,74 @@
+From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 6 Jul 2022 22:48:35 +1000
+Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
+ is disallowed
+
+---
+ xbmc/utils/GLUtils.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
+index 1ef804709ff56..c36dcf6a20fec 100644
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
+ void LogGraphicsInfo()
+ {
+ #if defined(HAS_GL) || defined(HAS_GLES)
+-  const GLubyte *s;
++  const char* s;
+ 
+-  s = glGetString(GL_VENDOR);
++  s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VENDOR = NULL");
+ 
+-  s = glGetString(GL_RENDERER);
++  s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+   if (s)
+     CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_RENDERER = NULL");
+ 
+-  s = glGetString(GL_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VERSION = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VERSION = NULL");
+ 
+-  s = glGetString(GL_SHADING_LANGUAGE_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
+   else
+
+From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 11 Jul 2022 09:39:02 +0000
+Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
+ pointers is disallowed
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index 8a18288fd8af0..033c0f77bf454 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
+ 
+   if(status == Success && items_read)
+   {
+-    CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
++    const char* s;
++
++    s = reinterpret_cast<const char*>(data);
++    CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
+   }
+   else
+     CLog::Log(LOGDEBUG,"Window Manager Name: ");
diff --git a/media-tv/kodi/kodi-19.4-r2.ebuild b/media-tv/kodi/kodi-19.4-r2.ebuild
new file mode 100644
index 000000000000..060512a9f02d
--- /dev/null
+++ b/media-tv/kodi/kodi-19.4-r2.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.3.2"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="19.1"
+PYTHON_COMPAT=( python3_{8,9,10} )
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	EGIT_BRANCH="Matrix"
+	inherit git-r3
+else
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/RC}
+	MY_PV="${MY_PV}-${CODENAME}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+PATCHES=(
+	"${FILESDIR}/${P}-fmt-9.patch"
+)
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gbm wayland X )
+	?? ( mariadb mysql )
+	bluray? ( udf )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+	power-control? ( dbus )
+	vdpau? (
+		X
+		!gles
+		!gbm
+	)
+	zeroconf? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/lzo-2.04
+	>=dev-libs/flatbuffers-1.12.0:=
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+"
+COMMON_TARGET_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.1.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/crossguid
+	>=dev-libs/fribidi-1.0.5
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/spdlog-1.5.0:=
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	')
+	>=dev-libs/libcdio-2.1.0[cxx]
+	>=dev-libs/libfmt-6.1.2
+	dev-libs/libfstrcmp
+	gbm? (
+		>=dev-libs/libinput-1.10.5
+		media-libs/mesa[gbm(+)]
+		x11-libs/libxkbcommon
+	)
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/freetype-2.10.1
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
+		=media-video/ffmpeg-4*[openssl]
+	)
+	!system-ffmpeg? (
+		app-arch/bzip2
+		dav1d? ( media-libs/dav1d )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.68.0[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	!gles? ( media-libs/glu )
+	>=dev-libs/openssl-1.1.1k:0=
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udf? ( >=dev-libs/libudfread-1.0.0 )
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva-vdpau-driver )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		media-libs/mesa[X]
+		!gles? ( media-libs/libglvnd[X] )
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? (
+		dev-libs/libxslt
+		>=dev-libs/libxml2-2.9.4
+	)
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	lirc? ( app-misc/lirc )
+	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+	dev-libs/rapidjson
+	test? ( >=dev-cpp/gtest-1.10.0 )
+"
+BDEPEND="${COMMON_DEPEND}
+	dev-lang/swig
+	dev-util/cmake
+	media-libs/giflib
+	>=dev-libs/flatbuffers-1.11.0
+	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libpng-1.6.26:0=
+	virtual/pkgconfig
+	virtual/jre
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local platform=()
+	use gbm && platform+=( gbm )
+	use wayland && platform+=( wayland )
+	use X && platform+=( x11 )
+	local core_platform_name="${platform[@]}"
+	local mycmakeargs=(
+		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
+		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DVERBOSE=ON
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CLANGFORMAT=OFF
+		-DENABLE_CLANGTIDY=OFF
+		-DENABLE_CPPCHECK=OFF
+		-DENABLE_ISO9660PP=$(usex optical)
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_RapidJSON=OFF
+		-DENABLE_INTERNAL_FMT=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_FLATBUFFERS=OFF
+		-DENABLE_INTERNAL_DAV1D=OFF
+		-DENABLE_INTERNAL_GTEST=OFF
+		-DENABLE_INTERNAL_UDFREAD=OFF
+		-DENABLE_INTERNAL_SPDLOG=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MDNS=OFF # used only on Android
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex !gles)
+		-DENABLE_OPTICAL=$(usex optical)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_SNDIO=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UDFREAD=$(usex udf)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
+		-DCORE_PLATFORM_NAME="${core_platform_name}"
+	)
+
+	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+		CXXFLAGS+=' -DNDEBUG'
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all
+}
+
+src_test() {
+	local myctestargs=(
+		# Known failing, unreliable test
+		# bug #743938
+		-E "(TestCPUInfo.GetCPUFrequency)"
+	)
+
+	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+	KODI_HOME="${BUILD_DIR}" cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	if use !eventclients ; then
+		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+	fi
+
+	python_optimize "${D}$(python_get_sitedir)"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index af13ecec01cb..ac87a094b950 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a774693c32c2..950e8d8d2b08 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 11:39:49 +0000
+Thu, 14 Jul 2022 17:39:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 95415fee7991..657412b4b62e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-07-14T11:39:52Z
+TIMESTAMP 2022-07-14T17:39:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQVOpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCiuQ//VYiA9aoecXYAt/tCjSLS8qVBB+izi7WdU1WMjQqVZCnWOFz/Zmdpxuiy
-uHZ7/C8/Yseoh6gtn1jZwQwydFxbTLEVOU6nFKiWQQBXCU22H0AG9IoANX3Zi9r/
-XbVMGXqZFTiiOrWrumXdpdiL6tdx8EFKakxck/kDs4cAgjrLsJ71jyB8vxxte+VU
-DEpk5yHr9LmVBYSb9VZXIUvacpQSiOoJkMFB6STTooqcRAZZtILcCiILVm4i9BwY
-JdN3YR2Z/2/j44epvg/fcmYQmx+npkrs+lgkSZeZ7F5l+m6lkjbaQcqcLRlm/drs
-aOsoks2zgWQLrdu0KtlGPZSXQs7ZaH/TD73gO42iyNJTp1Qf5p48L6VA10u9tLmf
-Av/0j+5RSGHQXpg46va8bxxBRP9IRQ7QOo4R2/Qzaoy1hrZi6mT+QCOGLqajmbfl
-A9T0MYqhLSie/WMF4AIvzCZBhOcQbU2r/LCLn6xFczG4/lXSKwtWaZEAb+j1uR91
-/sOts7cRE1nrXaHbZZX2iVfsCom5d+DWHqF9tkfTFP4g9n17UkU/N5DveEl5xO7A
-PtFooh9CSb8Ynn8ObL4Kc5wavq0CoGDQIQOJ8oUNXV291M1FejUoWKUxPLWVvjMP
-k/x79deVxTtsOW8uhIZCbrAVvmyCYFRNc878/Pp+BwPYKtYUZh0=
-=7YZl
+klCrrQ/+Lza71+pNBCF9Po9xgSwUtCeN+3VfjSGTqD7kK0gJvHJrhPISlr3bOC7F
+CdugOzAi7S/7cChe2EYR1cZ6lcKS7A2G7xV0cPSGFQ+e+4+Glhg6Galm3Lz4u+SK
+rzITexId7yAvbrSJyvY3AKdEMYlcyM2rya90/WTXnlekZ6wRKuFlr0l/eX8+rZGy
+VccfKNKgn+IhDqbu8UXf01DzFouL0v6QpHsFF4Z0PQxL9jJXQJvxMh4+Tx3rUsLR
+T/gLVZiiBhQbwE7zwcVvOtwqYsVCcDAm1bguHSWSiXycK9391bpSKaK/10gtL6mr
+FN30GyCfMlXmk2CGz9+6CvcM5oiVa46q/t6LIXca1UW8Qxww0NTexkw0bae9yEPX
+8lc5a9YIKitLmhRiOurPQh4zF6A7HqIHfimVfyxWmOA2BlIZyFj8AllGIS/8QkFQ
+6xy9Cmel0U1EibcLCiwpCz9ZsrFB/Et+pSfAWcN95z2nweqHbv59pQsjMc+iMWZm
+AkC0af5GRx0DHx1IQ0/2fyCXxMuID3uLgm1E3aJsspE7OH4C+4LcXVYlmfQ3kix8
+E0/mWqrtDxHgsQXlWaw8qT+uyorv2cp6j4pA+hjAuMzrbWoL0K0oNe+9P58KtZDI
+gzIvcenmu/9FtSJeHkSTBF05oUfKCCF6OEFpxd+XqbU3YKIsOH0=
+=KCaO
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a774693c32c2..950e8d8d2b08 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 11:39:49 +0000
+Thu, 14 Jul 2022 17:39:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0854c60c5ad3..9665f72e7a02 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 2470b99f1c7e..3e171b999cf6 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.5 b/metadata/md5-cache/app-emacs/proofgeneral-4.5
new file mode 100644
index 000000000000..5d030d21bb2b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.5
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A generic interface for proof assistants
+EAPI=8
+HOMEPAGE=https://proofgeneral.github.io/
+INHERIT=wrapper elisp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.5.tar.gz -> proofgeneral-4.5.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=779b31916225f372a3ed68314c2465ad
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fc3285a05889..f82c10f0fec1 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/razertool-0.0.7-r4 b/metadata/md5-cache/app-misc/razertool-0.0.7-r4
deleted file mode 100644
index c0de0d1a2591..000000000000
--- a/metadata/md5-cache/app-misc/razertool-0.0.7-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/glib:2 virtual/libusb:0 gtk? ( dev-libs/atk >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Unofficial tool for controlling the Razer Copperhead mouse
-EAPI=6
-HOMEPAGE=http://razertool.sourceforge.net/
-INHERIT=autotools desktop
-IUSE=gtk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 virtual/libusb:0 gtk? ( dev-libs/atk >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/razertool/razertool_0.0.7.orig.tar.gz
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	6af347b3c27477b48efaaa1261a0dd69	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a1daf2c96300bdf8484d9d451df079de
diff --git a/metadata/md5-cache/app-misc/razertool-0.0.7-r5 b/metadata/md5-cache/app-misc/razertool-0.0.7-r5
new file mode 100644
index 000000000000..49fc3e31caef
--- /dev/null
+++ b/metadata/md5-cache/app-misc/razertool-0.0.7-r5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/glib:2 virtual/libusb:0 virtual/udev gtk? ( dev-libs/atk >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 ) virtual/pkgconfig
+DESCRIPTION=Unofficial tool for controlling the Razer Copperhead mouse
+EAPI=8
+HOMEPAGE=http://razertool.sourceforge.net/
+INHERIT=autotools desktop udev
+IUSE=gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 virtual/libusb:0 virtual/udev gtk? ( dev-libs/atk >=gnome-base/librsvg-2.0 >=x11-libs/cairo-1.0.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.8.0:2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/razertool/razertool_0.0.7.orig.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	udev	f3a0a3964e2028a140c181f00eea9712
+_md5_=cdd7f968bdef00183eb9be6c7a2b2959
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 64f0af1a095d..6d6f64256fd6 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/libreoffice-7.3.4.2 b/metadata/md5-cache/app-office/libreoffice-7.3.4.2
deleted file mode 100644
index 590068cc5a8c..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-7.3.4.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=8
-HOMEPAGE=https://www.libreoffice.org
-INHERIT=autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-7.3*
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.3.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-help-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-help-7.3.4.2.tar.xz https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=725afe465e79f75ac3eecc7de501877e
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-7.3.4.2-r1
new file mode 100644
index 000000000000..52f10ce6f031
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.4.2-r1
@@ -0,0 +1,18 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-11 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=8
+HOMEPAGE=https://www.libreoffice.org
+INHERIT=autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-7.3*
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.3.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-7.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.4//libreoffice-help-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-7.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.4.2/src/libreoffice-help-7.3.4.2.tar.xz https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d7e103b352b21e208e76d7156a1bee5b
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.9999 b/metadata/md5-cache/app-office/libreoffice-7.3.9999
index 5563f34058ee..c6b52e57889a 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.3.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-11 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=8
 HOMEPAGE=https://www.libreoffice.org
@@ -9,10 +9,10 @@ IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +db
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ab0c5529c211ec5c6483f92c9fdcd477
+_md5_=7a5f74530adff164cdc5dcfc99d17973
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index e2752cfc7d3c..7ea3d807c583 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core || ( dev-java/openjdk:11 dev-java/openjdk-bin:11 ) ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-11 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=8
 HOMEPAGE=https://www.libreoffice.org
@@ -9,10 +9,10 @@ IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +db
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( || ( dev-java/openjdk:11 dev-java/openjdk-jre-bin:11 >=virtual/jre-1.8 ) ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-www.libreoffice.org/src//libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cab17cae5e01ddb50cd2a0dee7b3881e
+_md5_=2b62c14a7bd98bf7bb3870230721fc73
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index df856620dcdc..8418995b1114 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.6-r1 b/metadata/md5-cache/dev-lang/nim-1.6.6-r1
deleted file mode 100644
index bb3a3030ebc7..000000000000
--- a/metadata/md5-cache/dev-lang/nim-1.6.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=readline? ( sys-libs/readline:0= )
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=8
-HOMEPAGE=https://nim-lang.org/
-INHERIT=bash-completion-r1 multiprocessing toolchain-funcs xdg-utils
-IUSE=debug experimental +readline
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=readline? ( sys-libs/readline:0= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.6.6.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6.tar.gz -> nim-patches-1.6.6.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c6fe57c5d2c3cb9be174d65f97f9fba7
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.6-r2 b/metadata/md5-cache/dev-lang/nim-1.6.6-r2
new file mode 100644
index 000000000000..42396522ca57
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.6.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/
+INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+IUSE=debug experimental
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.6.6.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6.tar.gz -> nim-patches-1.6.6.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5a96eb0170851f2ab4cd5cb5e8bcdb4a
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index a366e529895d..1c7e40efe4e7 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.2.6 b/metadata/md5-cache/dev-lisp/sbcl-2.2.6
new file mode 100644
index 000000000000..c6e569c39e43
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.2.6
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=8
+HOMEPAGE=http://sbcl.sourceforge.net/
+INHERIT=multilib flag-o-matic pax-utils toolchain-funcs
+IUSE=debug doc source +threads +unicode zlib
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.3:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/2.2.6
+SRC_URI=mirror://sourceforge/sbcl/sbcl-2.2.6-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.2.6-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=3d0dd41037c56e9942c44c0a4d63627c
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index b76aea75890b..6ca92be3ee2c 100644
--- a/metadata/md5-cache/gnustep-base/Manifest.gz
+++ b/metadata/md5-cache/gnustep-base/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-base/gnustep-base-1.28.0-r1 b/metadata/md5-cache/gnustep-base/gnustep-base-1.28.0-r1
index b85bb941781a..8bdaa8e44219 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-base-1.28.0-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-base-1.28.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls:= ) icu? ( >=dev-libs/icu-49.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( dev-libs/libffi:= ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) icu? ( >=dev-libs/icu-49.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( dev-libs/libffi:= ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
 DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
 EAPI=7
 HOMEPAGE=http://www.gnustep.org
 INHERIT=gnustep-base toolchain-funcs
-IUSE=+gnutls +icu +libffi zeroconf debug doc
+IUSE=+gnutls +iconv +icu +libffi zeroconf debug doc
 KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls:= ) icu? ( >=dev-libs/icu-49.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( dev-libs/libffi:= ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls:= ) iconv? ( virtual/libiconv ) icu? ( >=dev-libs/icu-49.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( dev-libs/libffi:= ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
 SLOT=0/1.28
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.28.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnustep-base	8158fe5f5dc2dd0d9f89124c5adc36e8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=74a529920ca33e5ff71b9e896f09e7cf
+_md5_=3c984db208b8c0fb0ab8df7ea47f94cb
diff --git a/metadata/md5-cache/gnustep-base/gnustep-make-2.9.0 b/metadata/md5-cache/gnustep-base/gnustep-make-2.9.0
index d2b4399082de..6d44cb59431e 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-make-2.9.0
+++ b/metadata/md5-cache/gnustep-base/gnustep-make-2.9.0
@@ -11,4 +11,4 @@ RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-de
 SLOT=0
 SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.9.0.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnustep-base	8158fe5f5dc2dd0d9f89124c5adc36e8	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d3483a43fbe1cc91fb7618818dea0a0e
+_md5_=625230d7fc43b5b474ef4231ade81442
diff --git a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1 b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
index 7e0781201f66..85418702d062 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install prepare
 DEPEND=app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
 DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
-_md5_=547398a099bb2dda72d975bf8ca9b968
+_md5_=5fe27d01db7881896b7ba003b23b40be
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index 55b872d0df58..edbfd5134128 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-22.04.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-22.04.3-r1
index c67c1e98e8ee..70f7a7340c5a 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-22.04.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-22.04.3-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
 EAPI=8
 HOMEPAGE=https://kde.org/
-IUSE=+bittorrent dropbox samba +webengine
+IUSE=+bittorrent dropbox samba webengine
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kget-22.04.3:5 >=kde-apps/kopete-22.04.3:5 >=kde-apps/krdc-22.04.3:5 >=kde-apps/krfb-22.04.3:5 >=kde-apps/zeroconf-ioslave-22.04.3:5 >=kde-misc/kdeconnect-22.04.3:5 >=kde-misc/kio-gdrive-22.04.3:5 >=net-irc/konversation-22.04.3:5 bittorrent? ( >=net-libs/libktorrent-22.04.3:5 >=net-p2p/ktorrent-22.04.3:5 ) dropbox? ( >=kde-apps/dolphin-plugins-dropbox-22.04.3:5 ) samba? ( >=kde-apps/kdenetwork-filesharing-22.04.3:5 ) webengine? ( >=kde-apps/plasma-telepathy-meta-22.04.3:5 )
 SLOT=5
-_md5_=9f9a63b837b72527eb440a942dd530c3
+_md5_=452ddcfcbaa2798c57fbf07d00651b5d
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 560e0a7f0264..b60fbc35f6dd 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r1
index 3802ec850de2..e26df3bdf0e2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.6-r1
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.4:5 >=dev-qt/qtdbus-5.15.4:5 >=dev-qt/qtdeclarative-5.15.4:5 >=dev-qt/qtgui-5.15.4:5 >=dev-qt/qtnetwork-5.15.4:5 >=dev-qt/qtprintsupport-5.15.4:5 >=dev-qt/qtsql-5.15.4:5 >=dev-qt/qtsvg-5.15.4:5 >=dev-qt/qtwidgets-5.15.4:5 >=dev-qt/qtx11extras-5.15.4:5 >=dev-qt/qtxml-5.15.4:5 >=kde-frameworks/attica-5.92.0:5 >=kde-frameworks/kactivities-5.92.0:5 >=kde-frameworks/kactivities-stats-5.92.0:5 >=kde-frameworks/karchive-5.92.0:5 >=kde-frameworks/kauth-5.92.0:5 >=kde-frameworks/kbookmarks-5.92.0:5 >=kde-frameworks/kcmutils-5.92.0:5 >=kde-frameworks/kcodecs-5.92.0:5 >=kde-frameworks/kcompletion-5.92.0:5 >=kde-frameworks/kconfig-5.92.0:5 >=kde-frameworks/kconfigwidgets-5.92.0:5 >=kde-frameworks/kcoreaddons-5.92.0:5 >=kde-frameworks/kcrash-5.92.0:5 >=kde-frameworks/kdbusaddons-5.92.0:5 >=kde-frameworks/kdeclarative-5.92.0:5 >=kde-frameworks/kded-5.92.0:5 >=kde-frameworks/kdelibs4support-5.92.0:5 >=kde-frameworks/kglobalaccel-5.92.0:5 >=kde-frameworks/kguiaddons-5.92.0:5 >=kde-frameworks/ki18n-5.92.0:5 >=kde-frameworks/kiconthemes-5.92.0:5 >=kde-frameworks/kio-5.92.0:5 >=kde-frameworks/kitemmodels-5.92.0:5 >=kde-frameworks/kitemviews-5.92.0:5 >=kde-frameworks/kjobwidgets-5.92.0:5 >=kde-frameworks/knewstuff-5.92.0:5 >=kde-frameworks/knotifications-5.92.0:5 >=kde-frameworks/knotifyconfig-5.92.0:5 >=kde-frameworks/kparts-5.92.0:5 >=kde-frameworks/krunner-5.92.0:5 >=kde-frameworks/kservice-5.92.0:5 >=kde-frameworks/kwidgetsaddons-5.92.0:5 >=kde-frameworks/kwindowsystem-5.92.0:5 >=kde-frameworks/kxmlgui-5.92.0:5 >=kde-frameworks/plasma-5.92.0:5 >=kde-frameworks/solid-5.92.0:5 >=kde-frameworks/sonnet-5.92.0:5 >=kde-plasma/kwin-5.24.6:5 >=kde-plasma/libksysguard-5.24.6:5 >=kde-plasma/libkworkspace-5.24.6:5 >=kde-plasma/plasma-workspace-5.24.6:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.4:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.92.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.4:5 >=dev-qt/qtquickcontrols2-5.15.4:5 >=kde-frameworks/kirigami-5.92.0:5 >=kde-frameworks/qqc2-desktop-style-5.92.0:5 >=kde-plasma/kde-cli-tools-5.24.6:5 >=kde-plasma/oxygen-5.24.6:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.6/plasma-desktop-5.24.6.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.24.6/plasma-desktop-5.24.6.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=149a4ac79c281f324e899d322dc8866f
+_md5_=b7d1e8fcef794dbb8fa7dfbf0518b3d0
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.3-r1
index db3b3e84b020..2844f49c66af 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.3
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.25.3-r1
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.5:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5 >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qtprintsupport-5.15.5:5 >=dev-qt/qtsql-5.15.5:5 >=dev-qt/qtsvg-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtx11extras-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=kde-frameworks/attica-5.95.0:5 >=kde-frameworks/kactivities-5.95.0:5 >=kde-frameworks/kactivities-stats-5.95.0:5 >=kde-frameworks/karchive-5.95.0:5 >=kde-frameworks/kauth-5.95.0:5 >=kde-frameworks/kbookmarks-5.95.0:5 >=kde-frameworks/kcmutils-5.95.0:5 >=kde-frameworks/kcodecs-5.95.0:5 >=kde-frameworks/kcompletion-5.95.0:5 >=kde-frameworks/kconfig-5.95.0:5 >=kde-frameworks/kconfigwidgets-5.95.0:5 >=kde-frameworks/kcoreaddons-5.95.0:5 >=kde-frameworks/kcrash-5.95.0:5 >=kde-frameworks/kdbusaddons-5.95.0:5 >=kde-frameworks/kdeclarative-5.95.0:5 >=kde-frameworks/kded-5.95.0:5 >=kde-frameworks/kdelibs4support-5.95.0:5 >=kde-frameworks/kglobalaccel-5.95.0:5 >=kde-frameworks/kguiaddons-5.95.0:5 >=kde-frameworks/ki18n-5.95.0:5 >=kde-frameworks/kiconthemes-5.95.0:5 >=kde-frameworks/kio-5.95.0:5 >=kde-frameworks/kitemmodels-5.95.0:5 >=kde-frameworks/kitemviews-5.95.0:5 >=kde-frameworks/kjobwidgets-5.95.0:5 >=kde-frameworks/knewstuff-5.95.0:5 >=kde-frameworks/knotifications-5.95.0:5 >=kde-frameworks/knotifyconfig-5.95.0:5 >=kde-frameworks/kparts-5.95.0:5 >=kde-frameworks/krunner-5.95.0:5 >=kde-frameworks/kservice-5.95.0:5 >=kde-frameworks/kwidgetsaddons-5.95.0:5 >=kde-frameworks/kwindowsystem-5.95.0:5 >=kde-frameworks/kxmlgui-5.95.0:5 >=kde-frameworks/plasma-5.95.0:5 >=kde-frameworks/solid-5.95.0:5 >=kde-frameworks/sonnet-5.95.0:5 >=kde-plasma/kwin-5.25.3:5 >=kde-plasma/libksysguard-5.25.3:5 >=kde-plasma/libkworkspace-5.25.3:5 >=kde-plasma/plasma-workspace-5.25.3:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.5:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.95.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 >=kde-frameworks/kirigami-5.95.0:5 >=kde-frameworks/qqc2-desktop-style-5.95.0:5 >=kde-plasma/kde-cli-tools-5.25.3:5 >=kde-plasma/oxygen-5.25.3:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-2.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	34ddb6baf66ca3c9fba554b0c7c31cb4	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1bdb6068a78af78203399e1422765466
+_md5_=67352f5aa9ffebaf7215e12229d0f106
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b0412e0844e3..3c916e60dc32 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/zxing-cpp-1.4.0 b/metadata/md5-cache/media-libs/zxing-cpp-1.4.0
new file mode 100644
index 000000000000..cce00b6fb541
--- /dev/null
+++ b/metadata/md5-cache/media-libs/zxing-cpp-1.4.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C++ Multi-format 1D/2D barcode image processing library
+EAPI=8
+HOMEPAGE=https://github.com/nu-book/zxing-cpp
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+SLOT=0/1.4
+SRC_URI=https://github.com/nu-book/zxing-cpp/archive/v1.4.0.tar.gz -> zxing-cpp-1.4.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b603c1f00ed9fde6a1e78f8477fd64c7
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 994257ca4f4f..4dd89c57cab1 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-19.4-r2 b/metadata/md5-cache/media-tv/kodi-19.4-r2
new file mode 100644
index 000000000000..3259d6585d72
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-19.4-r2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+INHERIT=autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva-vdpau-driver ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
+_eclasses_=autotools	2fd69a56a527d12409ba43c733b7ac8f	cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	667174e2df1036a5520d3b3b3fb33e98	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4645163ac0fc71022181c0173e5dac26
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 03d42a6722af..c1f0f64183d2 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/libdockapp-0.7.3 b/metadata/md5-cache/x11-libs/libdockapp-0.7.3
index f2f85b754918..96337d4e1894 100644
--- a/metadata/md5-cache/x11-libs/libdockapp-0.7.3
+++ b/metadata/md5-cache/x11-libs/libdockapp-0.7.3
@@ -4,6 +4,7 @@ DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-base/
 DESCRIPTION=Window Maker Dock Applet Library
 EAPI=7
 HOMEPAGE=https://www.dockapps.net/libdockapp
+INHERIT=font
 IUSE=+X static-libs X
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=MIT public-domain
@@ -12,4 +13,4 @@ REQUIRED_USE=X
 SLOT=0/3
 SRC_URI=https://www.dockapps.net/download/libdockapp-0.7.3.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
-_md5_=f4dbf65c4dd7899b631c1ae2d723bb72
+_md5_=929d75456fd507477fdf739439dde260
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b598a0cbbd54..4665c6c1b2aa 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3
index db48462abd48..cd04440815b4 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.3
@@ -1,13 +1,15 @@
 BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure install postinst postrm
 DEPEND=gnome-base/librsvg x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=x11-libs/libxklavier-5.3 xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= libnotify? ( x11-libs/libnotify )
 DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
 EAPI=8
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
+INHERIT=xdg-utils
 IUSE=libnotify
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=gnome-base/librsvg x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/libX11 >=x11-libs/libxklavier-5.3 xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= libnotify? ( x11-libs/libnotify ) x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.3.tar.bz2
-_md5_=834c56d11834aa440e6b4e8da4d21632
+_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f5a917dd07449f4ef1ed84caa7338eea
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index fb96806ea64b..9384199486fb 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17708 BLAKE2B 4ce2223644596204d9c2bb3f48afce531273d698d0831b6c63489b590dab9b0f76b97e01974eb386fd4ee731e91da53e23679e783c4d88a79a610f95158b28ce SHA512 a1f139db9aee3a21dedb41e88e0ac33c6c041d7b8c88c3e9baf0cdb441d1f610d920165d40c97cd51b23366513243ae6bbe2d000a224c900523cffd5ea695cf8
-TIMESTAMP 2022-07-14T11:39:52Z
+TIMESTAMP 2022-07-14T17:39:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQAIhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmLQVOpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDWig//QoluHPXD6A4pRqlcFzvI17mi+oAPlovBQyZwWZrNy3xan1do0LWZ5Unh
-9a0HlszXL6ItovInp9Zro9tuD89LfQT9Rx2gymWfPJaSzyWblCG2Fevst5tykr2u
-yJm5PmlZkH/5LKVHkFZppbJOLNYI9BUXSO3r+BtgWtJvqhftlePnqHwLdt6CSdjL
-zSDX+qYJEJ1Auaui/WEZtLfOToX97Z73uFp1sjInkTFCiecQlAsC3s0+bw+MysgP
-PFKqiyiZYB716Q3VhiZU3iUlKsVf6fBuV7uEbA2BcDSruD3V1srGosv66iTKOgNL
-H140rz00OLI+LvCFcWN1bt0LwEkZWCx9f6TvROMnba3I576HwiixsNvpDEcrGvLM
-BzNdPqIM3wPZLZNMX+E3YQBtrWt/7j5laRAwhJdAmeWO47KK4sIo4TMOey8lC2rT
-BnYKyTmFUYsF+tWub6IouXZIJsTjyviVnmEx3YNQp31/EcGPW2yUtAjqjk0qj1Nb
-A/1clkWKVHziwYEM2HapT6S8T8QqAA075HRAaZPYLtEpU0NubaNyIAQ8IVWJUNof
-2xjoeixtZ4IBgLLdWlQBKCEek6MpsxnlCnYRW3tqcVh8TtISEPaTZN+/5MWpHs6M
-dAco3MkyEn/EKVGpBKyqmxBMUf172YntBl7sublwvabnoIdEyb4=
-=paYa
+klBmZRAAo3wcBzCYoekEeYT6K7piNHdcIJ6TWed0Z54uMiaf/J4NHZAdAsjWv2sG
+iS85xK5XJk9kSaRDxa5ZEVayeR6ebeoHe1aeZX8sdU4UuywiXCzA+f4alrij3opo
+ESh74RiaAWhPW03cW8MT/GYs/DVhieIcRkLhtp64UV0cAdV3huDOhx561BfYTSXY
+HNu57zLa3Oh3O6VQwOEp/QIxJDwBSL10AocSm1wW2SxoGFNOVQoWt94gjlzRpkVf
+kkAB5EPA4DZ9qajdzgmHI2M/Jr9qJtTMFOw/BJeRf8ghUuyzLY9MG2EOGYWLI63U
+9ceO2id2ckHMN6RixQu6KXCU0YPGlwD76J3Mn3go/rwPoBN0g+AXpeD1hMGUZY9k
+hT4vPR+H7anN/JIhCIUrA+3cU1K9SEChPWXSTYHcd7pV+k+Adt4QAN7Ufc6UngFe
+8UbTV/34qI1cHWkrdHo3D5PQSENqJ952MnNpISm3Ao/3iiAM7/oaAy8ZioSUQXq1
+zjgv5hzB2omLqOnPN3JzreGQWzW5mByvbnQyvu2Wdy2eXarQMql6jS4iC9FZ76Ek
+gZ114m8GmP732h1/+KJv2sstt7YBSZLygp1h1ICa6k8kwphj7fV40sVHPJHRQ4UV
+FIgK6hPuhTk4+Ajjv8fKqH37iiUCsz/ZDsBRpq1d2HrfXRLtT/Y=
+=1yIc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a774693c32c2..950e8d8d2b08 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 11:39:49 +0000
+Thu, 14 Jul 2022 17:39:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 943ab1013807..f895c732b9cd 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul 14 11:39:49 AM UTC 2022
+Thu Jul 14 05:39:48 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 503d89338d07..4729ee7a2506 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 11:45:01 +0000
+Thu, 14 Jul 2022 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index c6fbe319df1d..39e8dc74b3ac 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8479cc25c9e1386322c358e300e53c8c5900b6af 1657796764 2022-07-14T11:06:04+00:00
+f8aa778f4cc4fb73066b3094b50d1aa6562d5b9f 1657819638 2022-07-14T17:27:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c935f0f8a043..63b362bb6055 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1657798801 Thu 14 Jul 2022 11:40:01 AM UTC
+1657820402 Thu 14 Jul 2022 05:40:02 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a774693c32c2..950e8d8d2b08 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 14 Jul 2022 11:39:49 +0000
+Thu, 14 Jul 2022 17:39:48 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f8371a6248c6..7b987327f95c 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 996b5d4b6100..59a0d2bf7eae 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -82,11 +82,9 @@ x11-base/xwayland video_cards_nvidia
 x11-wm/mutter video_cards_nvidia
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-04-25)
-# Depends on either unkeyworded dev-java/openjdk:11
-# or unavailable >=dev-java/icedtea-4, bug #785640
->=app-office/libreoffice-7 base java
->=app-office/libreoffice-bin-7 java
->=app-office/libreoffice-bin-debug-7 java
+# Mask java on old bin-versions with it unavailable
+<app-office/libreoffice-bin-7.3.5 java
+<app-office/libreoffice-bin-debug-7.3.5 java
 
 # Daniel Novomesky <dnovomesky@gmail.com> (2021-02-24)
 # Depends on media-libs/svt-av1, which is unavailable on x86
diff --git a/profiles/package.mask b/profiles/package.mask
index f5d0f205f10e..72ab56ae5c15 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Bernard Cafarelli <voyageur@gentoo.org> (2022-07-14)
+# Dead upstream (last release in 2013, no tarballs or git download)
+# No reverse dependencies for a long time, several test and build failures
+# Bug #857948, removal on 2022-08-13.
+net-misc/csync
+
 # David Seifert <soap@gentoo.org> (2022-07-14)
 # Unmaintained, no other major distro carries this, code quality is
 # abysmal, build system has major issues, tons of patches, EAPI 6,
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 59efad258986..31054cc13109 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 7cb6b96056dd..f43e5b56ce0d 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,3 +1,3 @@
 DIST libdockapp-0.7.3.tar.gz 387507 BLAKE2B 83c11c81701b2be5eb197cf54ecb9ff34ad5d6cd730b2538a6ec8176dbf3728a98ff635a2da4ba2cc9238b559f1f6fe59126f9880e11099541a1e2d6e0faf246 SHA512 38d35599675fc8a8e9d14b0f059a0d1585106ed870210712f53f315d0442e98ad1df40a74b9f00e3f22656cb859d03fc93793b6042b9432394e572b89c58a815
-EBUILD libdockapp-0.7.3.ebuild 838 BLAKE2B 868bd90c0848729dece265eab56ed4279c933843c4895813bc17a7b074b75034260063c0d9d2471d6b1c1b7ec533fdad0be9f0704ad89493ff32bc53de841a8d SHA512 dff47541befa928726da8a9ada2fab5c2ce9e6fb5f59f0f5231073b01afc5791895c7e43826eefbc3b8a491d212d44d57a4ac50a54e418ae3aa8b6c2c8ec64c4
+EBUILD libdockapp-0.7.3.ebuild 889 BLAKE2B a0434e3095a5af3a3fe8d5e342631a51da047cfd451f1f1fc53510d1a968f0a70396427f9fc29816f35c20e0eb622f26100598b0a6e9e220439cf6a20c96d19b SHA512 4b961bf95351f09892d538b657a4dd6a1171f19d555ddf15d7fc9a882ae6327ac102395d61e3d37ea925e3863c98b82aeda039ec50420939ebd96167aa10a94e
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
index c4abdc8a2259..5683049601de 100644
--- a/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.7.3.ebuild
@@ -37,4 +37,6 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	font_src_install
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 83b9d9f18d3c..a8cd8a9e1c6f 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 67b22edd558f..ab43f992c1ff 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-xkb-plugin-0.8.2.tar.bz2 868539 BLAKE2B 20a7a27903be434490b3328f04d57a4ceb505dc1b63e4c98d584c72e6ad0dbc742251c0d9f43ba1da869caa2924627b6cfddd969874a3f5fae8fbf90ef577da6 SHA512 3078c11e1c10195480251c455995e4342c27b06949fc754396824f03bed885f32078f4c1436d86782de031cf4f4f806b530ca53116d4bedb54dda19b68ec7062
 DIST xfce4-xkb-plugin-0.8.3.tar.bz2 864177 BLAKE2B 4c4c5ab781265e50ddb14210566f608e2798f881d4b06e7e8f121c466ea0eebb694cf394b0bec747b7a5f1f99962ee1d014f29f077ef877e8063c23934eff1b4 SHA512 02ae82a1e01b7cc54154545c6ff42a450a81ba44697620ebb716a663300ea08fbf6ccafc5fd4d710791f142e1c249f17b613d90ffd99025ad97dfa0230ee55b2
 EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1068 BLAKE2B 95d10631992cf8d76916361951007278460f4d7e41efcd785a08f000227826970f123b25575b8d5243a7af47bdf1200392bab90c5559fab06acd373f2eebc69d SHA512 991ff7adfb8937b723015f8e1338c6d69982f3da8e7c42349f84be6240f0a5345284100f8fe2c3936fcba9f4bdb147f002be436465de2576aab7835410aa1d4b
-EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1149 BLAKE2B c49c2ab144c0f878f469a8777c633ce8f045b82a9ffd7823c79e8b18856d346cb61177e9b9744ce5f85ab36c24109d55301e4812b7dcf386fd6d3a7557b1a54b SHA512 c218d6ceafb44364e7959f757c911bb91a3b539cc9f459e9e3d83dadd29b4f138af2bed3849b39eec6b891abd692cba13bc552ad42f8d1c152c33f23da067f34
+EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1252 BLAKE2B 4b5a58a9b6ba9dd4b394a64a723d1851a1498aa9d8199682c666b61e249d4d6f914eba81997422e2d85ada64a39e39d11d0f6c300bef9037c62d57a0aab3322b SHA512 7ce39af466c02bc86537b45dc3445d639615ba75619529897a5643083bf7ce0701e36684df5f758c33eef3869fa131e8cbf41cb7db91c4f434254f7e744ee5b0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
index cf690e000d06..502e2fbc0692 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit xdg-utils
+
 DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
 HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
 SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
@@ -49,3 +51,11 @@ src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}