gentoo auto-resync : 14:05:2023 - 16:01:32

458 files changed, 1766 insertions, 7803 deletions

diff --git a/Manifest b/Manifest
index d58727a61bc8..d201021644b8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29474 BLAKE2B 53b9ff4d616f21b1eb59da5bf8c072a0689b6ec85aa32263f8db0c372c87af860cd62f1a2894059f859f0585494a8781eda74720e2d06029c3189c1b4b3c9f5d SHA512 02825b63d594f1372b245d34618a0a2c3a2160fe58580e6c0dfdfadcfbd90b9b949bf19c22bb8df2ff2004cafb44a206cc3f811db69353b590056cbcd18873ef
-TIMESTAMP 2023-05-14T08:40:02Z
+MANIFEST Manifest.files.gz 29446 BLAKE2B 489ebda61af0c11e27e36ae3d5fa523ad505bb8ea66e972101fbf3f6f6cefb4188977478ae517d3436f94486cbef4a837c5f40e44e8776bd16e3e5a2bf2f9e60 SHA512 6dcd420676d0aaf0ec8499d9f5b170dbc79d565d4fa1b406f0e2d9f3bf3aecb1d8585f7926a44aee0a57b4623b3512004474ce05d6efe215a4e5d0c9a82b328d
+TIMESTAMP 2023-05-14T14:40:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRgnmJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRg8sFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA5IBAAjEVq3pWm0v4ZjMldvrmj80PNUFflbwEGhAsg1diJb4D3nPRRHeuMyKtm
-FeEfCM+mCAFr3AfXJXjtNYYv6m5WEeqOHB67KaZboQx7/LfVod5wBWfz3St83zkv
-mvSIrHXVIKLYVQtjjB6VtKkxKnLN42I1rm5sThCLvzCbS6RL/6TAoquuBUhOWGc8
-h7nuK4wCpKlKtWVCx5Z1yj2/YHbm0kmCdonV03UoNjW7CAUnQ/MYemxiBPIqDRIx
-U9NiEHYzuN4oyY1x3oRWHjXL/P3o5zK+T8e8ztBLFqWks3Kk+DVUjmJdCIG0SP6J
-GYenq//8tJEP2Rrm4jfC494eGfsTPG3glE+X9d5ppFhKa/RSL8ElgryLZC/fy7Vq
-pmF5yu+HfF68HV4RRmexeMcKelZKXoLGe/tCJ/ZUaXuu2OW5TrjOnI98c8v9Ej/v
-OaLnpW5leMWnR21zS1NhiIHA7UZDFgsr66J4tGvJdqxSI1jV+Yk0jNBbpvZ2USEe
-vcUOG+2vqrpUMTfZSOIHaoj673QqDonWEAJTD61shSNtfpdx9XZASt77v6M6Jc92
-cSPT9m8dKYUh6/U/AHkq4IWICRHUhMt4hEkI5PUKt6EBgbYZDxk43q6YkdDPxqIm
-xenwRA/XnaoxIb9t2XBqNI+yltBOhuz1gX+VyYxqPS5PXgJF8h8=
-=pxZ2
+klDTmQ//U0VEan6zfhtrvDHXHSufv6EcVaercMH5iWmpOoHDYE6G46tbQ0F2r/MA
+Z/WS6YM0ySu6Gb14LYnL2jtxxMfe7iGDPLCaYl/7Oc40752nfgol3NyT5HeleY9H
+QQ4Ms5r0SJOsQMYqv1fM31sdzArWFNdwFLnLoxAhCTFjqY9PI+RwyDq4scrHtr6l
+ghVWYjtW5C0QbxfTAwROPYCBZfZplGwzIdM2MtybN44ddGUuo+GEDi/e8e/v2/Dr
+sWKEoqPrIWpBySa0wTr86JOvEbhQnQK71ukG2JcjRZP010DHQdGq5bmAqoc7A0Be
+xpW9skKloi9LCtKlUxcj6w1PNlG2YAdLapFsT8TvkbkUDnZBGe5x1pu27MLoJZKN
+eUnTxzF4Ss/wgzOKVtJhP//x9OgKORQRP8UhLCTX7i5ESUXyeqyqZq0XV+ATRyNp
+W/afuXYiQU7PhLE/cdMvaXLG8gor2QAZDJhqmrX52783FqViaaT4hKSjN4BnZZuJ
+QCWwigPBr+M2FOB4iz8LSaaHjhOxlYg/4jA6NNlCeCuIseHrxT4RsCqToc+kk8hN
+Tj10byRbu/voG8s+h/V5JEguojinH3GHpqLzEl1gZAu6PLDmrsbgACbexJCAl0yj
+iuEsQlgwFu87i2uwkwcjLKmqskYZugTXmwaGdNEeK+n8YAo6SDQ=
+=vG40
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index fca6f9924422..cdc6d799dcb8 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9e872b9e820c..19448fdfffe7 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unshield/Manifest b/app-arch/unshield/Manifest
index 30dfcab3241c..3f024ed390e9 100644
--- a/app-arch/unshield/Manifest
+++ b/app-arch/unshield/Manifest
@@ -1,6 +1,3 @@
-AUX unshield-1.4.3-mandir.patch 776 BLAKE2B 6d0c23a3cf0457ffb03f8f6a08667bfec7bd2fe1744867febfd9ce9a786a0e7b84408cbd5a2c23eb94c68d33a17d2c638ab7e44ea6ae0d95d5c0cc280b0ed585 SHA512 4acc69f49e3828f1dac5448b22d6015cd1c4f551c22c9d824d0650790ec509d02e7ef13f18b58bc338d25d7e93bf334d2ae1bbf198b2b831c183707b22bceceb
-DIST unshield-1.4.3.tar.gz 58822 BLAKE2B 89e23462610d7ffd25358cb1d9f234b5c80a580deb60e85610ddacc8e3aa92420cb0e885e80375089e93786565824813f23c54f7c4d60b7773f23d174c98e5d7 SHA512 2f058e0a28d0497e2afe231ded1b1bb16745401398eb1035e628d263351b10a1343c9664f3937b8912755db9dc5236a1b43e9bcba596affb7aa8b036f49382aa
 DIST unshield-1.5.1.tar.gz 67454 BLAKE2B 7def714e8d74312de8b822b0add92a803fadda0394252587219c7379791ec33680bf9430c6811e71354fd2e9ccc91e28697e31a2377ecc16aa43edea1ce30e57 SHA512 acb130c461bed66dc3804394be067a68aea96a7cd20b348e713f64a11bf642b74f68fc172f220a9790b44573abbe01ed4585191158f27c40e863918a7342c1ca
-EBUILD unshield-1.4.3.ebuild 839 BLAKE2B 3a26eb3a131f4a1a50c8588927da2078f342bc6cefdc33584f1593c05bd77670d5c6ffb19e5ac35a8a602d416775fc90aa52031b9925c4cffb721c0c852b525c SHA512 e062f76ae2e56c9728b1373feacef51dd31e48ddae09fcaa29331f6e78a9a81e804a9ffda8ec90dc3b188d340af31e189fceb7ffc0667059acc39ba47f587063
-EBUILD unshield-1.5.1.ebuild 796 BLAKE2B bf3826c73f9f05e13ec286f7dfd85f19735f44cd638b02eb2aa022e6580ff47fcc1f1c5b964e094d27e1573e8d725284f7e5d37f7d158d15db1fbb1af30958e4 SHA512 07302ff5b8df686c2451cc46d3c52dc952f6b085d9270967c09385691e87854d77c736677fa175d5adf8cd1f26f3fb06fc3b24c42ab62ca0a5e8e6bbb4f3f8ea
+EBUILD unshield-1.5.1.ebuild 794 BLAKE2B fc1e14bbdd4a9933e24f51a2e38be281ee6874aba409ea8b43086bc5b37030bee15e096faa7d889f70d3bda167869ee1863a77abbd0a602875fedaac859f9510 SHA512 148781bf6de94b083db2fee1fb99439a87492bc8aa0270f6524f52f79a1ef9387aca29877645d5972be930b8116a19de10f8fc863dbcd6924341c347e8d7be2d
 MISC metadata.xml 252 BLAKE2B 53cb03dc869146a76fb5fcdf82fbff2de9d5ba3089698bbd483e0e0042e2c762aa4fb847c8c7013470b3e87d7e2006ced995489e58261709025a8b2e7fcfdb5e SHA512 cb1ad379f1fb78be79dff6b6562a8adde061767668bc05859b11cba5a244977c5f28e10c2c30dd0aa9a26607c3f6bafbc72a29a268ce67101a7519aeebefd06b
diff --git a/app-arch/unshield/files/unshield-1.4.3-mandir.patch b/app-arch/unshield/files/unshield-1.4.3-mandir.patch
deleted file mode 100644
index 49f634fa8631..000000000000
--- a/app-arch/unshield/files/unshield-1.4.3-mandir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From cf53f87fae324e1a4c5d9ebd49b88947a9b02267 Mon Sep 17 00:00:00 2001
-From: Dan Church <amphetamachine@gmail.com>
-Date: Fri, 2 Nov 2018 11:00:20 -0500
-Subject: [PATCH] Fix man page install path
-
-Use the standard CMake variable to determine location.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0c20d3..0aeecb5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,5 +87,5 @@ endif ()
- add_subdirectory(lib)
- add_subdirectory(src)
- 
--install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/man/man1)
-+install(FILES man/unshield.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libunshield.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild b/app-arch/unshield/unshield-1.4.3.ebuild
deleted file mode 100644
index 2980dff623fa..000000000000
--- a/app-arch/unshield/unshield-1.4.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="InstallShield CAB file extractor"
-HOMEPAGE="https://github.com/twogood/unshield"
-SRC_URI="https://github.com/twogood/unshield/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-# OpenSSL is detected at build time, and used to determine
-# whether or not a hand-rolled md5 implementation is used. The build
-# system prefers OpenSSL's implementation if it's available, and OpenSSL
-# is common enough, so we prefer it too. Since the dependency is
-# automagic (there's no way to hide it), we require OpenSSL
-# unconditionally.
-
-DEPEND="
-	dev-libs/openssl:0=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
diff --git a/app-arch/unshield/unshield-1.5.1.ebuild b/app-arch/unshield/unshield-1.5.1.ebuild
index 5531273c3857..a016bb33cdc4 100644
--- a/app-arch/unshield/unshield-1.5.1.ebuild
+++ b/app-arch/unshield/unshield-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/twogood/unshield/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 # OpenSSL is detected at build time, and used to determine
 # whether or not a hand-rolled md5 implementation is used. The build
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 661bc2351ba1..1092014ae577 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/rdiff-backup/Manifest b/app-backup/rdiff-backup/Manifest
index 06986e032253..eff8a0b89212 100644
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@@ -2,6 +2,8 @@ AUX rdiff-backup-2.0.3-no-docs.patch 972 BLAKE2B bc7a6abb337d306c2e2f57f70446683
 AUX rdiff-backup-2.0.5-py311.patch 1649 BLAKE2B 89a4885cabb8a921522ee39f96187ac81dcd3d5b37a9c9ae3f0d3cd526eca432e1a007fc7add4dd436b03e09dcc57b016542437f0cd15fc5203e04f515c05124 SHA512 f085eab1cc1ec6de1f5c166752db0d1cfa07618e60537008c4d6edee0085a039a0f3d460c0d5ceefd2810d1aa3870a5b176567796577921c00359d9cb039c22e
 DIST rdiff-backup-2.0.5.tar.gz 456115 BLAKE2B 9cd51644e11af3320fa5aca7864388da4b1165a1fc9e660265445d861eb356ba32e3b148a1d8de8e702bd9a6f0276ec3a4453c85ec702d80be5839661a1a679f SHA512 59482e6d78bc887fc99efd4b4779e9b41c7e4b0427e51b80b18a550d0051e4213a0c200296154759d1734f511f7abe3175d171f018c59c55e5abdfd0a890cfbd
 DIST rdiff-backup-2.2.4.tar.gz 941625 BLAKE2B 5635c8a418f482d44bac354415f33ec46d7f82fe4212517aef65712977ff9024c253515ef74b5696d200cf3d2b4f132887c22d35b633f02963ce56cab687b89d SHA512 3777038f90a702aaf0d87737ccd79dd6a0bc9d6bd49dc8154fbcd240b9b1971f5a5f3cc0ebffb623f1eeec82cb939fbdee75a813d27ef9eb78d5700ecc2716b5
+DIST rdiff-backup-2.2.5.tar.gz 941748 BLAKE2B 849d5b44378786c01b5ba9e0dd0a2409db91fa97f45771e6077d18a233a0d354b1bbe4093ae6763204447bda0c3c72f1d5646309a3e6c710d2a3df30e7a3debe SHA512 d7b0cf11901349977683a31ab263c37bee9ff65b64ec2d5ebf800869b09ff9c13335c64a1f2a90b5e151f7fceabb3b4a60b0359346b34497c71e89da31e661a5
 EBUILD rdiff-backup-2.0.5-r1.ebuild 1044 BLAKE2B 20b4ce3754dc0cb0fa6118ee294ab24ecddfb72905bbeb89dc9b89cd047a633bbd3527caeb7d6e0950f8c2549ed007d3a97b32fd003c425a70743964efb7155f SHA512 6b29b36819e311e9cdb3b4dde30e1465742d13c19776eaeb955317ad7b54995400506b5bd6fc5eabdd0e95696d3ba7c2d55d03e7796ad59e7bc0172b280593f1
 EBUILD rdiff-backup-2.2.4-r1.ebuild 869 BLAKE2B 267233fd4e7ed9c19ec3e611009eddd809648fab57295598266fdab7ddbdf34bb86648ed7d572be230c0837a9153c3c31450069307813d4f158892289839dceb SHA512 120fd57b040d988f806dce90de6b4000aae5ab7557506f088f95696bb6907b8f3a0ff932d4671c572dc0747de0fb21489a1a75fdb0f0781b961112827960c968
+EBUILD rdiff-backup-2.2.5.ebuild 885 BLAKE2B 3100281d6b75bf6e134549f4286fbf9d8534381824dbae80500493b31efe529b076465b176cf7228555700f3c6ff75c6373c8c37e1751c84b2bae2844e18886e SHA512 90981c8e36dd37c7b93780e2918f2cb5a5725a28865f2bbec6f906db60a41d7445c50d428e1228467d6fb61764f02623b02b3fae69469a5c4f4f1b5798aa8f68
 MISC metadata.xml 393 BLAKE2B 345d8ca991657bcc7a84568942ff68f074568c247a6b68bd650967673e1ea126045ddcd4c16d8761bfd763b6daf86856fa5e4f7c503db2417e8a5eec47d6595b SHA512 c2ac0d3e6ff267541b42dc421ffefe57b4c8b34b57123a2fa2f9c9137deffe380202b97bacb989d0b11dfdc66daf76c3f3969d6bdfec2aaaa45bc57d7f5c6491
diff --git a/app-backup/rdiff-backup/rdiff-backup-2.2.5.ebuild b/app-backup/rdiff-backup/rdiff-backup-2.2.5.ebuild
new file mode 100644
index 000000000000..3bc133a0ddd1
--- /dev/null
+++ b/app-backup/rdiff-backup/rdiff-backup-2.2.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYPI_NO_NORMALIZE=1
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="Local/remote mirroring+incremental backup"
+HOMEPAGE="https://github.com/rdiff-backup/rdiff-backup"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+# Tests use a tox environment and separate steps for test env preparation
+RESTRICT="test"
+
+RDEPEND="dev-python/pylibacl[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=net-libs/librsync-1.0:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -e "s#share/doc/${PN}#share/doc/${PF}#" -i setup.py || die
+	default
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0597b57c01b1..a19647bf6e23 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 2b096ded278f..4839216eae3f 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,15 +13,15 @@ DIST emacs-28.3-rc1.tar.xz 47896700 BLAKE2B 2d7da4a72cc1256c7b9d1157cd379a5373b6
 DIST emacs-29.0.90.tar.xz 51961984 BLAKE2B a87f0ad81181cca3737d534702a79df9a50a659126d431a9fa0288297907bddc2d8593689c4f7e127d26498420878b48633c46e6f27945efe763314375ae6bfd SHA512 348b2173391f5fcc9ea445e10491d90289fb78664741b3909553e814d0370d5cd8abc17d66c53a6c2a6a6c60a25a226b9783039963bfc585d5bbaa4d0163436d
 EBUILD emacs-18.59-r15.ebuild 4342 BLAKE2B 08852c5c45cc4330fb7684be880272a3d2ebe71ad736226f6fb3300ea3a5ad615509ddec3f3f49cc9a563e12e37d3bce4c227f8778634a02a8e632c539877d13 SHA512 85e85041bdc5f509d874602602c7bf5a7ce220a8fbdb7af571570e50e37fba89ec07cfd312b555386aa82a87fa010737787cd829689a83506cc61f4eb84a3839
 EBUILD emacs-25.3-r16.ebuild 11006 BLAKE2B c749f5d7cb6da1d5c95ee41a632beb649d2ff20186852fc31aa38d0334eea7cb8d65bd5d3fd5468d4398a79cfab3abc3563210d1f8139f8bac1ca8bab9d895b1 SHA512 52a43806b11a6cf92423c5ba780f0a7177a54a1a751ceb3142406e2874ababcf6155c8531199b142664d87f455527f20b8371aaa93c6b82a0ee49622266afb7b
-EBUILD emacs-25.3-r18.ebuild 11010 BLAKE2B 7e8dccb6c1c52635284d97a5577f5090b76482e07a9134b0214ae1219ee5958a89b4dbb89a3eedcc8a5619c76c1322b813f5c7ae9c4acaf574b64a28d6dc3964 SHA512 7b182848e28c79512d7aad89827465f43639f115a6333ecca35c9eb76a4faa104c027806605e69b60b555a23001f5c1f167cf8d65fcb889536afb3014d107726
+EBUILD emacs-25.3-r18.ebuild 11111 BLAKE2B 7eed2b9fd03fc2a97db83c02e728e47242579d4feb18d694cc28e4aa4e7ea871ebd66fbc5584080c3ec2367fde05566f58e99a5f8b6f1f0e98ed0f1cea008764 SHA512 f2e820aa7557bb0c2e3162c52ea933dfbaa9952e4e597eb8b54b5ecac758ed2504eb2d5bd0bbfc5490b2558d0a3a06a98affe4608c3821b3a7c3f9686a12b586
 EBUILD emacs-26.3-r13.ebuild 11735 BLAKE2B bdad42b1056afc5d05d5ee0fac5675db240cc24f423f918db60552e7dc412e03438078310c5ae6e8aef37357bb22e53ce4a51b601071bb84c85e07e272c423fb SHA512 f7deda214c2af095628d245121df24c523b77451e9241212650b8982b79b4419127c81eec19c3802b6ea9c7d60c1ff905043b43ac7bd6a59a84700e64d9b8980
-EBUILD emacs-26.3-r15.ebuild 11739 BLAKE2B dc7677769a535decddba2f02d23ab0039e9fc44b982e2f724fe3adf41e2f7dde7887653e73f49006f5f1231e330096c6b7c9f7755bec2257152ea001698de3e9 SHA512 5aa2192be785e19c2ae33a646f6e573ed5afc088fa29b933e3881319a854a2ca896af6ab3c268da3547f492744bbc1b7755fb6e70159fef365da86e0480df1e3
+EBUILD emacs-26.3-r15.ebuild 11840 BLAKE2B 1da1ad814b0027d0a072df044dacacde2085c1338c8996fe56b545c26a8b55682b79e8dc2792e7214e70bbcb52e25853caee369474844f3880b987433dc97764 SHA512 2d30d5da78ff94c3e635e3fff27bc3945f3854f7cebaedd72251a5444c8eb498c91d377132e4adae45604bdd05af32e78a056a4e4c26802f125ca5987462d926
 EBUILD emacs-27.2-r11.ebuild 14255 BLAKE2B b92c82d64d3fcbc346eb714d68cb4f24617358c7f79267db08dac42aec9aee5dbbc774bed235847eb4e34fbf79d37017ffab6e260ddb32ad3d4c4960f2f79c1b SHA512 0718450c6177495ce403573d8f3d35f4f3f8d29965bcd969da8c361b7b26e7650650411704d200859aa5a742304a65bd594db98965152b24384a04fba130d9fe
-EBUILD emacs-27.2-r13.ebuild 14259 BLAKE2B 2ffbe5fbfe7d610cafc18ab5bd5b12dc148fce4eba6a371b3ac8a810a89ef2cfda92592b6c6e9471e8d6120949da19e973dccc1c86de618fed48b1868006e65a SHA512 906cecfa20643f06698223ef8bd7eeb547de16de3cc0f413379ef82cbee0c94af9211d4d9f3fb97e0eabedaaf5eb11e92c0f0e5118a1452608d75a5f7e4f017b
+EBUILD emacs-27.2-r13.ebuild 14360 BLAKE2B 79f518b218be4a6048c59a83a96e26a31af8b2a2717676a8ba61d5a75b9b157d0e19a1a28c90076184d61e9c30aaadb9f37e81576dee96cd08e9a1c460d875d6 SHA512 bf23521e6619539e53c04e4891cf72b7679ade8e1c47e8b801d6eaad69729cea673dc61ffb6f24c27fd11b5cf33bb522b241a179cd47a12ca59ca9cf82d7cf21
 EBUILD emacs-28.2-r6.ebuild 16702 BLAKE2B 444b3593d2764e7486c44ca2a1b577a1c4304eb9a64333ddc5de7ef4842bb00d2c5398ed7189dde146bf9976d9d62bdca1504c6780d86bc02f07ce06dd8267ed SHA512 7b9ed62ad0fade56649c5b9b78d6c8875ceee0040602d84002dc9a9827ff6b8ae582cf8cd2d6ace7a5ca70e44398fb405db5a2d2ae5d2c4bc0ec351d73105fe5
-EBUILD emacs-28.2-r8.ebuild 16706 BLAKE2B 1ede24e9cdbe73fb7036c1d9649910f0281f384d9e85ff1b5005175a8e363e965db991d818866dbcc96d31516825f0525b97e7b8e53b86ef167ab7ca120d4d37 SHA512 29c57d5bf18b3960064c75d80760eb676348b3f8d11e14e9388beb09c0fd860da3199ecac7e942ccb19c83c0ef22757da5b5bf450d6efc67ca8ef0f1b0b8f8f9
-EBUILD emacs-28.3_rc1-r2.ebuild 17194 BLAKE2B e9d430f92a3455e4f0befb26576e7fdecbe158989350f1deb0f86aac54bf7a89bfb6fe8dac239b6898e7ab3b62a715824cfc44cbf94f963ffe170d3b69d22ee6 SHA512 4e793ff2409ac5469d14a5f858e76ce358ac1297ea4b944384d58238f6095b96e2403c2de05c6e8d18274d784b9d9c603549f58f14d754fd3ee39ce2e6512f8f
-EBUILD emacs-29.0.90.ebuild 18134 BLAKE2B a5b338a0f4c6ea712097c7db3e736636f19043775daf57a409fcd972fdf7313627d171db8beafa1834410557e9d66fc82b6c8799042ec0c4e7f9968a9528d481 SHA512 4f6d63bdfb667e5b3bbf0b91c8111d62c0d89170380cb5a4b17cc661f52ed5bfa726ee32b17b4394252e744dcbd8287d46180a9a62bd77356d335008853d3e6c
-EBUILD emacs-29.0.9999-r1.ebuild 18134 BLAKE2B a5b338a0f4c6ea712097c7db3e736636f19043775daf57a409fcd972fdf7313627d171db8beafa1834410557e9d66fc82b6c8799042ec0c4e7f9968a9528d481 SHA512 4f6d63bdfb667e5b3bbf0b91c8111d62c0d89170380cb5a4b17cc661f52ed5bfa726ee32b17b4394252e744dcbd8287d46180a9a62bd77356d335008853d3e6c
-EBUILD emacs-30.0.9999.ebuild 18132 BLAKE2B a9da733bf2ea678362871d9b1c022fbdccc114bf08be643bceceb9dfcd6dc53566e34476a49bc471922371d9917ba9e9752fbcab4f21fe689a91387058e12801 SHA512 5fc4dabd2a2b24fa8a79428386c08360bf99d78e969b9347352e806f29cb0e8ebfe9b7b25d704955ac664f231a12b37711b1cc5fbbae18cb636d257cafb13163
-MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
+EBUILD emacs-28.2-r8.ebuild 16869 BLAKE2B 441b681dfd936c967aa55df8c396fa388363376b6f93c1cad6da574d3f1eddd03798d5c4fac54f8cd954caa2b3ae3c3aa07a6054727adaf40baf3d7e4a6a1a09 SHA512 528ec428cf057963ceeb1e3c254f1e6b12902d02badda9572a1452e7dcdbedaafeb04e56fc255e38a209a6c6a0b831e1200a3e7ff900954f14291d95b0cdd14a
+EBUILD emacs-28.3_rc1-r2.ebuild 17357 BLAKE2B 9dadd787a6fd60bcbf1b5b660cfee2165ba6c3aa38cc76264347ad30875e60be5fdbab9325c01c6467f3b13e4450ebbcb34446c4b36086f926a32aea8287b021 SHA512 6d0ab1f4a86ca3bc0d7ffc2d826b07ea49942b993f6b8b1021ba29ead210c56f1121350c4229bdaeb84cb2718931206049ef40976117c1e51579695022a03ff7
+EBUILD emacs-29.0.90.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
+EBUILD emacs-29.0.9999-r1.ebuild 18297 BLAKE2B f923f6a4e7cfc6c3ff044cc33d57c88b690af057fc232704e7c74c9dc9da23d7dc60b3e24faab751686b2c044b5c4351a6afb895ef99bede63f64c374e53abbc SHA512 4cf178150f7724d249bb2517ea61d6afc5ef34811a25b955139d0b9642128fa3fe60bd34b45007bab4d52b93955f88e11ddb81827a00eb5ef11c8ff6a7b47abe
+EBUILD emacs-30.0.9999.ebuild 18295 BLAKE2B 007b9b4fe471f98972555ea59d93d887f478cf40de5961fc90905ee884ef54a28502b788ae739107611e82e77ea39280c8e456aba5e0fcd7bcfe5cae007abcce SHA512 2f28762d9952a3a161761b72a40bd868311846a4b6076959e9eae8ff4287d3596a9dc4de8f99bbc2b90377094ef7c622f8380acff34047a4f8209c0292a54271
+MISC metadata.xml 3355 BLAKE2B 80f9cb0a2a9137cdcbe0623b8a69f099ac7d89930310afa60f486f9436ca222a026691c5a33d6afd3ff86a2553f133c627940f53b6778662ffcc52b3a5bffad9 SHA512 bc30eb4f8abd21422643e1271c86556052f5a49ccf03608441897eb96dfa91e03c0ebb107a1192d820a2d9317207bcb6a6a884add2c968388d03f5a52ef6cf7d
diff --git a/app-editors/emacs/emacs-25.3-r18.ebuild b/app-editors/emacs/emacs-25.3-r18.ebuild
index 9ef093a00061..cc776e3971a1 100644
--- a/app-editors/emacs/emacs-25.3-r18.ebuild
+++ b/app-editors/emacs/emacs-25.3-r18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib"
 
 RDEPEND="acct-group/mail
 	app-emacs/emacs-common[games?,gui(-)?]
@@ -29,6 +29,7 @@ RDEPEND="acct-group/mail
 	libxml2? ( >=dev-libs/libxml2-2.2.0 )
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? ( !aqua? (
 		x11-libs/libICE
@@ -228,6 +229,8 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
 	# Disable sandbox when dumping. For the unbelievers, see bug #131505
 	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
 }
diff --git a/app-editors/emacs/emacs-26.3-r15.ebuild b/app-editors/emacs/emacs-26.3-r15.ebuild
index 318b29e758af..139bb9118e16 100644
--- a/app-editors/emacs/emacs-26.3-r15.ebuild
+++ b/app-editors/emacs/emacs-26.3-r15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	sys-libs/ncurses:0=
@@ -31,6 +31,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? ( !aqua? (
 		x11-libs/libICE
@@ -238,6 +239,8 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
 	# Disable sandbox when dumping. For the unbelievers, see bug #131505
 	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
 }
diff --git a/app-editors/emacs/emacs-27.2-r13.ebuild b/app-editors/emacs/emacs-27.2-r13.ebuild
index ef2604780cb9..447f92392f49 100644
--- a/app-editors/emacs/emacs-27.2-r13.ebuild
+++ b/app-editors/emacs/emacs-27.2-r13.ebuild
@@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -64,6 +64,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? ( !aqua? (
 		x11-libs/libICE
@@ -287,6 +288,8 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/emacs-28.2-r8.ebuild b/app-editors/emacs/emacs-28.2-r8.ebuild
index c24ba748a523..68984dfbd9d1 100644
--- a/app-editors/emacs/emacs-28.2-r8.ebuild
+++ b/app-editors/emacs/emacs-28.2-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	sys-libs/ncurses:0=
@@ -67,6 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? ( !aqua? (
 		x11-libs/libICE
@@ -316,6 +317,9 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/emacs-28.3_rc1-r2.ebuild b/app-editors/emacs/emacs-28.3_rc1-r2.ebuild
index ab904936acb6..42b641e992ba 100644
--- a/app-editors/emacs/emacs-28.3_rc1-r2.ebuild
+++ b/app-editors/emacs/emacs-28.3_rc1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -48,7 +48,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	sys-libs/ncurses:0=
@@ -72,6 +72,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	selinux? ( sys-libs/libselinux )
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? ( !aqua? (
 		x11-libs/libICE
@@ -321,6 +322,9 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/emacs-29.0.90.ebuild b/app-editors/emacs/emacs-29.0.90.ebuild
index 4b9556db2893..d47ea6f5e379 100644
--- a/app-editors/emacs/emacs-29.0.90.ebuild
+++ b/app-editors/emacs/emacs-29.0.90.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
 
 X_DEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -116,6 +116,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	tree-sitter? ( dev-libs/tree-sitter )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? (
 		gif? ( media-libs/giflib:0= )
@@ -369,6 +370,9 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/emacs-29.0.9999-r1.ebuild b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
index 4b9556db2893..d47ea6f5e379 100644
--- a/app-editors/emacs/emacs-29.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-29.0.9999-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
 
 X_DEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -116,6 +116,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	tree-sitter? ( dev-libs/tree-sitter )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? (
 		gif? ( media-libs/giflib:0= )
@@ -369,6 +370,9 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index 6b5a455c09ea..1bb789044d24 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} = 9999 ]]; then
 	inherit git-r3
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib"
 
 X_DEPEND="x11-libs/libICE
 	x11-libs/libSM
@@ -116,6 +116,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 	ssl? ( net-libs/gnutls:0= )
 	systemd? ( sys-apps/systemd )
 	tree-sitter? ( dev-libs/tree-sitter )
+	valgrind? ( dev-util/valgrind )
 	zlib? ( sys-libs/zlib )
 	gui? (
 		gif? ( media-libs/giflib:0= )
@@ -369,6 +370,9 @@ src_configure() {
 }
 
 src_compile() {
+	export ac_cv_header_valgrind_valgrind_h=$(usex valgrind)
+	append-cppflags -DUSE_VALGRIND=$(usex valgrind)
+
 	if tc-is-cross-compiler; then
 		# Build native tools for compiling lisp etc.
 		emake -C "${S}-build" src
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 95c39fd0d0a7..7d8baeaeb306 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -51,6 +51,8 @@
     preference to Emacs' own scrollbars</flag>
     <flag name="tree-sitter">Support the <pkg>dev-libs/tree-sitter</pkg>
     parsing library</flag>
+    <flag name="valgrind">Compile in <pkg>dev-util/valgrind</pkg> memory
+    hints</flag>
     <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 31e825464ae6..7c2a632865f2 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/libegit2/Manifest b/app-emacs/libegit2/Manifest
index 2578bf3b7466..37089ae005c1 100644
--- a/app-emacs/libegit2/Manifest
+++ b/app-emacs/libegit2/Manifest
@@ -1,6 +1,4 @@
 AUX 50libegit2-gentoo.el 199 BLAKE2B f9f7b6d2c6d8a70d37e698dd71a40b0ccb4224c1276393adfe2eb546313cc3bea29136820f98d3579f6cdeafd0559e1739150be503233de44dddefd3f97b66b6 SHA512 067030b050715f80251b28a179c0b4779efd311c4d5c1e0bb2bdd10f95442cd8f243c45c81f004ad8362740aa0139667324ef9c829abec7291ddfe801ea4c67a
-DIST libegit2-0.0.20200515.tar.gz 132122 BLAKE2B 2e8e06fb833e5ea2ee0f4e1fa760d30e91235a9b9c4a465de6d8a12d6c8431bdc85204546ba36c36f206e2788d9f1cda00d578c1c40057ccfb3f2117e8302013 SHA512 f604591ba272ea1cef8c428f644c0cfcc4ba2438a55c2b7a0dd1cdcb15836c755c0c6bdc6c42bd6da05935bba7fdac30efe65f26307599b07e591f4efdd1e897
 DIST libegit2-0.0.20230129.tar.gz 132237 BLAKE2B 339c11eaa5b231d33a3b23780b625798d47ab6725fede240ae95307cc0034a61a39d84075be271fff2ae8b1ff5143fb61ef243671f8ac927b07e931824c8c55d SHA512 9384e9118b29429aaa8ee7608712bcc1c9f006a35fb46332f9b999be909ac18c4753af58cd1c91c37a6b24ca9a08f7103f22d53a242296d0dc6a509a2c5e27fb
-EBUILD libegit2-0.0.20200515-r1.ebuild 1054 BLAKE2B 9ada2156b66eed269f4c42616b007666052a10ad4352373377ed63a43187cda7f21ab70612e160e8c250ce5d36b77e0550cea53dbb81a02b770dd4a526548dc8 SHA512 38afc5dc2897eca226a1673df70f5f2de14b63f2f530842dd284052857da1dbd8fab7c79020040be4dcc7d26876158fb1ff4fecbc5adde4f75f52c65c177b865
 EBUILD libegit2-0.0.20230129.ebuild 1057 BLAKE2B 327ed004dfc3dd337416c656577159e43bb2f0a70dde6e090e2f2b99da304845f94f8192378adae21ee505b3b7f988a4265ee08203e68d8938fb4f4b9b7e1e63 SHA512 4a71333571b658b6e3d18d41028bad50565aef9f970ac19bdfce7afc4d6f291a56aa3dcdd1f51befe350ca0694f697a70a7f0c7fc2efa91b2b464ac742a4bb1c
 MISC metadata.xml 482 BLAKE2B 5217eaebb982cc094497ae980263833be6110d28c97ae7ef2324cc7bbeb400b942317973deee3617bfc607781318bd23f05904140324f064f1ccee1b9ab97f15 SHA512 13f73bd327d202c87f7e3ed27de50c3f6be1eb1941b4a753ba391f1ba3f4140eb3bcdfe1be5179ea1168ad1cedb963cb85f64b6f72ad1c112e8ea708b4a0ac9b
diff --git a/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild b/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
deleted file mode 100644
index e416b4617bba..000000000000
--- a/app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=26
-COMMIT="0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a"
-
-BUILD_DIR=.
-
-inherit cmake elisp
-
-DESCRIPTION="Emacs bindings for libgit2"
-HOMEPAGE="https://github.com/magit/libegit2"
-SRC_URI="https://github.com/magit/libegit2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/libgit2-1.0.0:="
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-26:*[dynamic-loading]"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-# The tests seem to be written specifically for the libegit2 git
-# repository.
-RESTRICT="test"
-
-src_prepare() {
-	# Don't build against the bundled submodule
-	sed -i -e '/subdirectory.*libgit2/ s/^/#/' CMakeLists.txt || die
-
-	rm -f test.el || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	elisp_src_compile
-}
-
-src_install() {
-	elisp_src_install
-	elisp-modules-install ${PN} libegit2.so
-}
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
index 6dc95acbc616..483476cf5398 100644
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -1,9 +1,7 @@
 AUX 50vterm-gentoo.el 213 BLAKE2B adb1452d0bf816beceec4367a33176034f90c46b1649178cce093160117d14c01d1ccebefa57bebbf276d01e812223876a766567fbbb95589851b51db2456db2 SHA512 2847b924a1e3218d433391396681642a88192396a60f25f5da6824a9546a0f155d068b1bfc2115f0698b87e07ca50845ebbdc0a71de2ff8203fdf14b7e43ef0d
 AUX vterm-0.0.1_pre20210618-dont-compile.patch 772 BLAKE2B 235f1050ccf434663da28794f8b04b8f7e02e824373a75ba214c3ad213dc598f5390c22d3ad068fa2c8b041232664ff5170b08d21c8e9d60b8ea1eb3dae44a48 SHA512 8787887ec2d7c2ee09710ca8683bf90e3ab81d930288e66d74a926f3619f4bea2e37f1bdec0021192b85dc3dbcf778b4e4f5ad82805b35033b212cb43fcbe5e6
-DIST vterm-0.0.1_pre20210618.tar.gz 58389 BLAKE2B 71221d470e01d647093e3a3af0c57b416ef23e81ff4d783d032613e19f1d467752fea0d242ea0f72092e3cdabbdb88ba15a840d9e4116cf5aa95d54a020efe0d SHA512 9e23eff1c9c5d2cc8e970bb4d9910b3e0258987d09b765ece188641ff5e2696e30d59a409f45253f243162b8e71c0ea301049ff37c93ffec1e1c25206ca9c5d2
 DIST vterm-0.0.2_p20221118.tar.gz 60288 BLAKE2B a86e2a79457eb02212402a3054bd867af38caf2c52e1d2fd21cbd7a665f2383909ef99fa6291c9e0a6d9841d65dfbda175937bf219ec7e1e8fb8bd1c5add300e SHA512 1825ef38afc2d4144611b81c49c64b5271bc58cd96f6d3bdc6869d2d9c7cc7785864621035e3e787f7c2c0634672806ba217f3c3d589dfc342d59bd5480f96a1
 DIST vterm-0.0.2_p20230217.tar.gz 61049 BLAKE2B d974e8873b2f3074c23f797eb862734ed6af2caca2213c0cb972b92180567ea87e25a2d435d592dd7a2f236380fce0180b161490e506cffef24f11d25b38fbc6 SHA512 c13b79054d305e2ee73725d323a1409c8d0f9529b13c659a3e7d273dbaa79f09cde5d4e3097ed2b40b106b4fad0c5f465381e1a8337e9ffc21be0515e376c42a
-EBUILD vterm-0.0.1_pre20210618.ebuild 1242 BLAKE2B 9ccf5d930934d0b3fe78ef29c21ec51e2785ae9077b6d6f81d0f887b4c1eec87019ae1701b4c84021436bb6feea19b211574242ae7dddb5015a25449127e5637 SHA512 2a2c915c097b7f5eb2c4691dedfcf976dfbfd94d9540aeba5829db3c2f10852aa39f36550e84e825cb05e657e592fc19394a073d49a4ce5d7031b6ca41840d64
 EBUILD vterm-0.0.2_p20221118.ebuild 1387 BLAKE2B 2170bfb0df4e8c5bd23c23be18fe2297cd9c74871581fc0bca04fbee6c2f69f25f71d22bb617cc4505c5ed4df25a311eb24980a01796131e0eb94aa86a52ee0d SHA512 794fda5744e6738fb6bc060fcd8d20054f490623775f067e4a93c0858ced6b8a5c2831f11fba1b2196bf369c9b915a825b7058ac594d4111aa4af8ecd45515ab
 EBUILD vterm-0.0.2_p20230217.ebuild 1642 BLAKE2B 9a456716c3c937b685d9c1f2147d40c6fb9889e0e3b4ccd95d969db344d656baa2eedf64089cfc1f8886b08acde6de466a46a545c7f3324190a3e11ddd5e8f74 SHA512 c2d2dd21e7bf6016428878f8286242795743da9ca4776ec45385d2f7a8793a2aef02c95185505012ffd2e7d0c38657ab7393e5a80a32cba4a5f076697292b0fe
 MISC metadata.xml 634 BLAKE2B 09ec6e8f2b00735c5fc3dbca525205b0b98a580feecfea36a1c2b435bfd6de2e4b5e85c47c07f4830da1b3ddc8793d06e4e6ec3a02e5df19c876e0251226f5c7 SHA512 09d9be89b4275192c5048eb3a7fc3729d6d4923861bc5ab075c8097e7bb1f6776649e82440e53b1d0236dc669a4580aa2da31da5cdc5994b59eabaffdeeedc61
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
deleted file mode 100644
index 921cdf52715f..000000000000
--- a/app-emacs/vterm/vterm-0.0.1_pre20210618.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=26
-COMMIT="d9dfa624679afdd5db6ad25429ef86d3dd91401e"
-
-inherit cmake elisp
-
-MY_PN="emacs-libvterm"
-DESCRIPTION="Fully-featured terminal emulator based on libvterm"
-HOMEPAGE="https://github.com/akermu/emacs-libvterm"
-SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="dev-libs/libvterm"
-RDEPEND="${DEPEND}
-	>=app-editors/emacs-26:*[dynamic-loading]"
-
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-PATCHES=("${FILESDIR}"/${PN}-0.0.1_pre20210618-dont-compile.patch)
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-src_prepare() {
-	if [[ -e ${ESYSROOT}/usr/include/emacs-module.h ]]; then
-		# Use system header file instead of bundled one
-		rm emacs-module.h || die
-	else
-		ewarn "${ESYSROOT}/usr/include/emacs-module.h does not exist"
-		ewarn "Falling back to bundled header file"
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=("-DUSE_SYSTEM_LIBVTERM=ON")
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	elisp_src_compile
-}
-
-src_install() {
-	elisp_src_install
-	elisp-modules-install ${PN} vterm-module.so
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3b4a05ea2c53..9c08881cef91 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 05b5772821ae..c34a23d7d09b 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,4 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
 DIST appliance-1.46.0.tar.xz 145436856 BLAKE2B d9ed31f533a2772b0f506176b39bfdfdec1421fe4ff7934ccdb1db0cb2644d477211ec1a2d372d7e5dd0a8f278f47a39bff813b7bc4c9a038258a5f6358b4e91 SHA512 842119bdf95dbbd61328891e9bd0b557bed90ba79c6419ee18d1a79cd4a301ea6922339b9e80ac314ff3e16498e9d3c594861aebe8e0fc2db41d285eb8e5d578
-EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 15a836f9fdc727488040c1ac088c783774bfc7bbadb92acd68c2d2e6a09f40454ee2f20833243776c6284ea675cf8c38c148b6972bd8455387569339d2396e62 SHA512 f2ec240206b089e97838c5a0389f1da6e016ccb20435e677591a0371767d2bb44373bb52550df380f14d13914b4d4f045b786b2a177d240b5936709a798f8156
+EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 345f96a34bba44962bde9a5519ae48b31efee8a5dc20c47a31241cc1d438f9492a844e6cf959b28a62b49fae6805fc87ef520dc9cdd526ac52067c72030566cc SHA512 b78dfdce10db4ea0a7cdcddcdcccdc6e341f6b05223fa7831be8c45e015280383d8e8336ae0ddece18fc1214b9b8d9faa3b0dee12619bbfc702abf6fa6f9ae73
 MISC metadata.xml 290 BLAKE2B 8084923ecdcdc254e65a614e963d9f97d1e22855e69c30f8843ae7e1fdc2d983efbc70a9165a4113e0dd6a14aaade55cd260cc58b3823895effaed2d26d98951 SHA512 c727a188cfcc8f4c475518d79c44c4d0b9c2b37061a13a9e62121b564228ee3923c696800080cba3e4549ce0cba5efc59fd71cba9917ce79d40444b670ad7ad7
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
index cd4ef2e43f0b..8322e7a5b674 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
@@ -31,7 +31,7 @@ src_unpack() {
 
 src_install() {
 	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs || Die
+	cd "${ED}"/usr/share/guestfs || die
 	unpack ${A}
 
 	cd appliance || die
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index c6b3e6d6ee57..830007ea1647 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 270 BLAKE2B 979c3e8d2a3c1d4f30af8f2d9954434dd685abf42992abf0e6
 DIST spice-0.15.0-pthread-c5fe3df1.patch.bz2 7605 BLAKE2B 86b8094a22a02080db038ef98972bf09f391d5344fee8df2aa7d2def0b50a581353cb0e3dd97f99bbd58b88a13ceac4b54be8086a9f4274f38d132b27b62e84d SHA512 5075bd260b33c2dad8c3ce641372383871f7d69190a4f4697bd5e12af1bf5429310c592961de001d36c19a9cdd91143b8d6e8be0e08b3850b9700c2aef2ddd78
 DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8e8e3af536bccd6a2a75185194ac7b87521163090c4312e392d2ee10036c0283171c7796aea630e1307128a2d55 SHA512 0a776d191c395ce1f7ebbbac47956a00a2765327d3127aeca6e232bd56fd4ccd28750ae1599eb6eb2909ac909cda517d5511faa631166db16b8b75bd4e7b86d9
 DIST spice-0.15.1.tar.bz2 1623290 BLAKE2B 19ddb3cac91be07a4a358ed89a5e4d1a5c406a9831b8c8a518764055354ecf6e09d129ae03ba65d876669da72f2cbf0c307261564097f60951711e9852eebb69 SHA512 362ab2f0b483911830693834515e1d331a6b929c5c63fd4522e843c42bbb7d8a52510d60f5f17d175dd2617c9621630f6a81f3ff7dce11dc28e6fb135e60fa86
+DIST spice-0.15.2.tar.bz2 1663326 BLAKE2B 00f5393ac409590b8fe0203251b811a4fe6dca16e644a30dd8165d57ff28cbef3b2f9c2a92ff7d2f6c8092bbef4f89a4e85ef9228cc8c03b0a163ffa3afaf9f6 SHA512 c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26
 EBUILD spice-0.15.0.ebuild 2604 BLAKE2B 40d0d68bfd8232c0374cfa5dc008b2517a2b29d18adf1f1586a01476e267005aedeaae3e4bd73aba253bf745d6f4f21a84d02b37f58bd9ded36495bb0188c407 SHA512 33ede49338fd89cd78b8e8ee1729cf41bd643f64499581a3db4544dbb869f4d01cef213e5f160a6b45db6161e7116591fbd6028569e1aff55f3624831c9e829f
 EBUILD spice-0.15.1-r1.ebuild 2566 BLAKE2B 89e3b2b4a8e94a05d1e732840b8f0117d1a6db4d628db3153b87c087bf86318c50a1262ea2ad040240197ed0a111e4c62d61f52b5355379125536ac424d168a7 SHA512 717a04f73fcc6cfd49f11e40d59521da0596d9d31e43443f836892500ca27c86ccb77c0141ceb99959bcc3e183c0ef84ff27126f253109f7001d32d0b6eb36b6
-EBUILD spice-9999.ebuild 2325 BLAKE2B 1a54f0320352d0df4a840b2b08c493e931dd4dcd28fdd7765c76b8c57e4cf8ca5b436bb8985a0450805156e7705db15a67ecf9bc91d7faf342f1f0afae88ec27 SHA512 f519394f922373f99be2615bc438e3b4a2d42f92afb4c64e608445328ca7897e05ab60e9192c6174f690f770cc090f081ca153a5c1761efc6be7aca678d312e3
+EBUILD spice-0.15.2.ebuild 2379 BLAKE2B 7866d3e03f116291c5f3f36292d14c14cefade232d0eb925f86ed08e54effb8c293b07cd4b4974b5ce1212c67f4deb2db1339e09489996c670a601f80459e9f1 SHA512 7a04ad61b88abe08c61ac77ddd79a99fa5f47b496df6bd04e9319bc453db243e5b64748d3f366928dcb2382f03d8db42776692b614ad9cff0291b1bf4a1cea1a
+EBUILD spice-9999.ebuild 2379 BLAKE2B 7866d3e03f116291c5f3f36292d14c14cefade232d0eb925f86ed08e54effb8c293b07cd4b4974b5ce1212c67f4deb2db1339e09489996c670a601f80459e9f1 SHA512 7a04ad61b88abe08c61ac77ddd79a99fa5f47b496df6bd04e9319bc453db243e5b64748d3f366928dcb2382f03d8db42776692b614ad9cff0291b1bf4a1cea1a
 MISC metadata.xml 474 BLAKE2B 62c3e1d9f11d515950c4eb8fda479808a73ab081932fe38994854dcec491aef63e08f3943074ae9bb33eee452b25a85b6ccff8a9d16c77acdb4c85aa8d126665 SHA512 75665383947d475f99e4f75a1d3599ef51e32e7a1b56fbf8fa49aabcb335e66ed29407187a5f9730f223bcf48a38ef1408db685b8a9401a06f73afebf5a673d2
diff --git a/app-emulation/spice/spice-0.15.2.ebuild b/app-emulation/spice/spice-0.15.2.ebuild
new file mode 100644
index 000000000000..b1b52a3283e5
--- /dev/null
+++ b/app-emulation/spice/spice-0.15.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+	inherit git-r3
+
+	DEPEND="~app-emulation/spice-protocol-9999"
+else
+	SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gstreamer lz4 sasl smartcard static-libs test"
+RESTRICT="!test? ( test )"
+
+# The libspice-server only uses the headers of libcacard
+RDEPEND="
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.38:2[static-libs(+)?]
+	dev-libs/openssl:0=[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	media-libs/libjpeg-turbo:0=[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-2.5.1 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+"
+DEPEND+="
+	${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.3
+	smartcard? ( app-emulation/qemu[smartcard] )
+	test? ( net-libs/glib-networking )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	use gstreamer && addpredict /dev
+
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgstreamer=$(usex gstreamer 1.0 no)
+		-Dopus=enabled
+		-Dmanual=false
+		$(meson_use lz4)
+		$(meson_use sasl)
+		$(meson_feature smartcard)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 8b1ec904e164..b1b52a3283e5 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -1,60 +1,63 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-inherit git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
+PYTHON_COMPAT=( python3_{10..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
 HOMEPAGE="https://www.spice-space.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+	inherit git-r3
+
+	DEPEND="~app-emulation/spice-protocol-9999"
+else
+	SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="gstreamer lz4 opus sasl smartcard static-libs test"
-
+IUSE="gstreamer lz4 sasl smartcard static-libs test"
 RESTRICT="!test? ( test )"
 
-# the libspice-server only uses the headers of libcacard
+# The libspice-server only uses the headers of libcacard
 RDEPEND="
-	dev-lang/orc
-	>=dev-libs/glib-2.38:2
-	sys-libs/zlib
-	virtual/jpeg:0=
-	>=x11-libs/pixman-0.17.7
-	dev-libs/openssl:0=
-	lz4? ( app-arch/lz4:0= )
-	opus? ( media-libs/opus )
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.38:2[static-libs(+)?]
+	dev-libs/openssl:0=[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	media-libs/libjpeg-turbo:0=[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
 	smartcard? ( >=app-emulation/libcacard-2.5.1 )
-	sasl? ( dev-libs/cyrus-sasl )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-	)"
-DEPEND="${RDEPEND}
-	~app-emulation/spice-protocol-9999
+	)
+"
+DEPEND+="
+	${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.3
 	smartcard? ( app-emulation/qemu[smartcard] )
-	test? ( net-libs/glib-networking )"
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/autoconf-archive
+	test? ( net-libs/glib-networking )
+"
+BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	$(python_gen_any_dep '
 		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-	')"
-
-DOCS=(
-	AUTHORS
-	CHANGELOG.md
-	README
-)
+	')
+"
 
 python_check_deps() {
-	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+	python_has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -72,29 +75,19 @@ src_configure() {
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		-Dgstreamer=$(usex gstreamer 1.0 no)
+		-Dopus=enabled
+		-Dmanual=false
 		$(meson_use lz4)
 		$(meson_use sasl)
-		$(meson_feature opus)
 		$(meson_feature smartcard)
 		$(meson_use test tests)
-		-Dmanual=false
-		-Dtests=false
 	)
-	meson_src_configure
-}
 
-src_compile() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	use gstreamer && addpredict /dev
-
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
-	einstalldocs
 	readme.gentoo_create_doc
 }
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 5913cb7943a8..9323910446a4 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 1d7f9e5cafc8..8edf8d7d5dbf 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,5 +2,7 @@ AUX lyx-2.3.6.1-gcc12.patch 493 BLAKE2B 47d74d13381689127bd2c53e7ef7bdd50231ff73
 AUX lyx-2.3.6.1-python.patch 2294 BLAKE2B 1980fe19607577d6b7462aaa4a049a41cbc329e881889cdee673df1bf57d7ab0dbfb8bd9aa705e23a88b1c195bd660f04efb519c9371167939e946c099b7784d SHA512 6f41de389bce14d8ef1c695268f6d6540276fe44d4871a14458f7ef38e6b4f4cb90877310d82df5550d537f39f65eded489722de24eb99ea6d83d8ec92dd7b71
 AUX lyx-prefer-xdg-open.patch 3470 BLAKE2B f989c3455d4cfb332d36edbca9b3bcc0208709d361696f04bdd565ea455104d1809877bdb85a362e950c2d48159c52d9a1a69c92d79f075269cfc9ccfceee4d7 SHA512 d17a2af0d75b6dcca06c1d31e615b814df3e75c3039c7ff5a14ab270b7cb75ab6f42ec851db7c804c90b7724a95eeec02d74de5c7511523c8400f0d50c2c0ce3
 DIST lyx-2.3.6.1.tar.xz 16242608 BLAKE2B d59c6db79d7760902f93405e3737974fa9c6bd79c5ab4b02010021532903c76a77701f1f99a0838b4379c548f3f37dcdd9eeb492b733c4162162d868d1d92970 SHA512 233f6c54d4a036ad12f33c6705810bfb99747bdbd015550a8a0a9d7b664d3be50a06dc337191b820c42de4407c5f790efa50c706a45fb2260a71f772fb22c872
-EBUILD lyx-2.3.6.1-r2.ebuild 4284 BLAKE2B 818fe23d98947b4931e6361daa7152419d6c1dbfdab8c195531fa0babc9c0872d25a241e85ab002556ab658c86e4281ccfcd6b1a0c966090fe63aa2bbaeed073 SHA512 af335e164b827bc5a5ee156d889a99993e08432a9d101d0107a79d72b2d06e4c3e3817ebce0577981d89b3b68d7c35d8108bec5e579922b25cd7e2d48ae62e82
+DIST lyx-2.3.7-1.tar.xz 16158416 BLAKE2B 6041280ab0cd4dfa3c10e8ae01253ff657b4ac9ffe4cf61a3a2459b7aef152a7daf8ae306a09aaece799b6e7b6b15bc1aff62ab0f5d46508fbd79fd3e0b1c45b SHA512 b8aaefb68993032354fea3c6fd87d6da161395c92b5def4ecf92a7d6873ec59e01cdfb45c51ae1aaa62aa54db8e100b00ff9c2c9e0f1307c2f46860cd8c6eefe
+EBUILD lyx-2.3.6.1-r2.ebuild 4284 BLAKE2B 67cc46be317a356809efe409a9846e93dba75481788809b5ded09c20e03deca257bdf93dd521d87c80e347595ad2e8164b43e3e2f318e761975ce1a4bd5085a0 SHA512 519dae65a05c8213014bc1602f084a8934828f8aa7fdd6548975682c0945bdf712d881e40943bcfd49cf16c71188fbf32cb2733e55a2121a0eb1ab0da90cf38a
+EBUILD lyx-2.3.7.ebuild 4385 BLAKE2B ab0fcf940897c207cb053d531d97ef4afe2e965b1c92e35dcc43cc3d315d53e70a4dfbadc88e022dbf2d5630444c2e53dbdcfe9f0c74a25b2085dc2acb4051ed SHA512 0d008f02643e48f037dca65d9373a2059a01c0f543f7492ad9d19a7d67354cc2b7057e356f896ca2a752a4af414ee8edac90098cd76cd2a06fb66db23f075306
 MISC metadata.xml 1270 BLAKE2B eaaaa462e91ba2e33dfd7e8507de5b8b2e392f3db01c761580b055407c65844ca4297db70e539b5c7db6a1420f2a30c0f75ddc25d160a78e598475bf36912f32 SHA512 d8f5361766f37c679b58ad329b24632ee11fe0ddce26aaf5cdfb1bd21a56214c6bff6076c8ba9e3584bfbe086e49ce9c4c7e0ba44e38deeaa33e11b6f5a6274a
diff --git a/app-office/lyx/lyx-2.3.6.1-r2.ebuild b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
index f9a7721d2dce..3ce28049be21 100644
--- a/app-office/lyx/lyx-2.3.6.1-r2.ebuild
+++ b/app-office/lyx/lyx-2.3.6.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 MY_P="${P/_}"
 inherit desktop font python-single-r1 qmake-utils toolchain-funcs xdg-utils
diff --git a/app-office/lyx/lyx-2.3.7.ebuild b/app-office/lyx/lyx-2.3.7.ebuild
new file mode 100644
index 000000000000..b0c0d78d5162
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.7.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+MY_P="${P/_}"
+inherit desktop font optfeature python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM (What You See Is What You Mean) document processor based on LaTeX"
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="http://ftp.lyx.org/pub/lyx/stable/$(ver_cut 1-2).x/${MY_P}-1.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bc needed http://comments.gmane.org/gmane.editors.lyx.devel/137498 and bug #787839
+BDEPEND="
+	sys-devel/bc
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+
+	x11-misc/xdg-utils
+
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant:2 )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+PATCHES=(
+	# Try first with xdg-open before hardcoded commands
+	# Patch from Debian using a similar approach to Fedora
+	"${FILESDIR}"/${PN}-prefer-xdg-open.patch
+
+	# Already part of 2.4.x (from Fedora)
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1965118
+	"${FILESDIR}"/${PN}-2.3.6.1-python.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind || die
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash || die
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+
+	optfeature "handling more fonts" dev-texlive/texlive-fontsextra
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash || die
+	fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bbaefaf09e61..9eb6d81f8199 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index b1f0f84fd765..9fe7eea17250 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,3 +1,6 @@
+AUX foliate-validate.patch 1073 BLAKE2B 276e30a9efd16cbbbe524bf4ef6edb3eee05b60dfe90a7b460718b016c9cf91ed751fc7a31922fcee4cf4f78cba8d478d9b19c48f9c6cd6a25227615474d2b55 SHA512 b1a28ba2e58440967b8ab683c3d0fc2e7e6510465690fd4494c643d2bad215fa57ce7cd5599def1fa585b8f6b94b650405e6355ef50b38d6bd6f8fcde56e63e7
+AUX foliate-webkit.patch 296 BLAKE2B bc6387586dcde1f2b59a7f1e1e5306f06c73813c0ab17d813eefd5b99fa08940e32307f94f9d6475a03255988aaf9968fbde6ed7111a626ec2c23def102aa7b8 SHA512 2ebc26006de0520edea6cdf427bb420e9a564a6e01294ddca45bb6973e505d54c4d4ff6b64301949a8494abd20a156c6e282ee3689e5206e8c5e2ae269efab0c
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
 EBUILD foliate-2.6.4-r2.ebuild 1209 BLAKE2B bfca831829a675d16b39a27a3a1449431cdb206b7609625df542e7c50d57c682065456e75cdee11126d8c4fbf1ae275b616349792bdfd5c332fa574c3e825285 SHA512 b9f37500296ac30323f85e8d42038438c4f5dc9cc11f6250548d3923a21d96c71e6917b02259a5de62a6585b02b1d46eca2bdbea7d03577b8de5c7fc789e4ffc
+EBUILD foliate-2.6.4-r3.ebuild 1386 BLAKE2B 169da3eec3f401b75bb94da57f182b8491031103c8f771de76e1df4e8a49c29bbe634b04499fdbbbd1838cba7f2997bbf1b84c83f9a1c7f344d4924047ae6eaa SHA512 9d0978ebd368c7b71715aa0e5d27d4834b38617f28189ad1a2eb491c243cef27ef946e587277f0495f90666aae8d73d5f8c3ba929e91bf0e5bbcdb779c0843d6
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/files/foliate-validate.patch b/app-text/foliate/files/foliate-validate.patch
new file mode 100644
index 000000000000..45d2c42eef73
--- /dev/null
+++ b/app-text/foliate/files/foliate-validate.patch
@@ -0,0 +1,31 @@
+diff -r -U3 foliate-2.6.4.orig/data/meson.build foliate-2.6.4/data/meson.build
+--- foliate-2.6.4.orig/data/meson.build	2022-01-13 19:23:26.000000000 +0700
++++ foliate-2.6.4/data/meson.build	2023-05-14 13:08:00.443754308 +0700
+@@ -7,13 +7,6 @@
+   install_dir: join_paths(get_option('datadir'), 'applications')
+ )
+ 
+-desktop_utils = find_program('desktop-file-validate', required: false)
+-if desktop_utils.found()
+-  test('Validate desktop file', desktop_utils,
+-    args: [desktop_file]
+-  )
+-endif
+-
+ appstream_file = i18n.merge_file(
+   input: 'com.github.johnfactotum.Foliate.metainfo.xml.in',
+   output: 'com.github.johnfactotum.Foliate.metainfo.xml',
+@@ -22,13 +15,6 @@
+   install_dir: join_paths(get_option('datadir'), 'metainfo')
+ )
+ 
+-appstream_util = find_program('appstream-util', required: false)
+-if appstream_util.found()
+-  test('Validate appstream file', appstream_util,
+-    args: ['validate', appstream_file]
+-  )
+-endif
+-
+ install_data('com.github.johnfactotum.Foliate.gschema.xml',
+   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
+ )
diff --git a/app-text/foliate/files/foliate-webkit.patch b/app-text/foliate/files/foliate-webkit.patch
new file mode 100644
index 000000000000..cb559bf0003d
--- /dev/null
+++ b/app-text/foliate/files/foliate-webkit.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main.js b/src/main.js
+index 718d420..2ea2018 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -18,7 +18,7 @@ pkg.initFormat()
+ pkg.require({
+     'Gio': '2.0',
+     'Gtk': '3.0',
+-    'WebKit2': '4.0'
++    'WebKit2': '4.1'
+ })
+ 
+ const { Gio, Gtk, Gdk, GLib, WebKit2 } = imports.gi
diff --git a/app-text/foliate/foliate-2.6.4-r3.ebuild b/app-text/foliate/foliate-2.6.4-r3.ebuild
new file mode 100644
index 000000000000..666dca3a88a1
--- /dev/null
+++ b/app-text/foliate/foliate-2.6.4-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson python-any-r1 plocale xdg gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="handy spell"
+
+BDEPEND="${MESON_DEPEND}
+	${PYTHON_DEPS}
+	sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	net-libs/webkit-gtk:4.1[introspection]
+	sys-devel/gettext
+	handy? ( gui-libs/libhandy:=[introspection] )
+	spell? ( app-text/gspell[introspection] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-webkit.patch "${FILESDIR}"/${PN}-validate.patch )
+
+src_prepare() {
+	default
+	python_fix_shebang build-aux/meson
+	xdg_environment_reset
+
+	plocale_find_changes "${S}"/po '' '.po'
+
+	rm_po() {
+		rm po/${1}.po
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	plocale_for_each_disabled_locale rm_po
+}
+
+src_install() {
+	meson_src_install
+	dosym com.github.johnfactotum.Foliate /usr/bin/foliate
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 03b70b0f67df..232bac6e30a2 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 35e6349f66f0..979274f3ed36 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,6 +1,3 @@
-AUX igraph-0.9.2-disable-broken-tests.patch 378 BLAKE2B 7f3748ec5d9ed8f9f97f638ebfa353a8373e3d672fbd4f0e697aaef92c1ac926386ee4fc38d94e2f2bfc1bafe0b44922f7c1536016ca6d7334bd419006b66f2a SHA512 93f4509b498eacb384c8af9d52c6c74efbc50c15e178d365774140421eff7005f7428e7f7da2d58cfd74adfda44e833e1b2fb54d220b6a64bdb144bf8fda0e7f
 DIST igraph-0.10.4.tar.gz 4279321 BLAKE2B 4e1fc8e8d6dd38cdb24ec564f51f2924e457376c258497b51d7dd4cec88d2226d5b202cdcfa69560e43fdb3cbd49656511178acd2ed705b4af26b1947a92f1ab SHA512 71bcec5f0ba100aae7614753f9232a4221580b822b4dc120e3a80eab59d70c42aedddb00728eb13faf7e522332c514c2e030314c416ded8a70e5de990ea8039b
-DIST igraph-0.9.4.tar.gz 3823988 BLAKE2B c62f15fd227a83da8a78c2bf569874e290c0f8ffd8c69353de1ff2fbd5dff290eceff2462495efc86f44303f3d9d0d397eba720a743da6c118dacb9eeff1b2b8 SHA512 1188d69b95f581d7dac5874dcdb2d1b1a322e39b275c6f092c199ed6214def814062bd46d573bdaa4bc8f4514d6840c6e93dedbe0f6c99a15de33cbc39356573
 EBUILD igraph-0.10.4.ebuild 1030 BLAKE2B 5b235af8c10ad6adfb0525db31253d93b6dddc49d2b8684128892b8ffa9ddec5fad7dcd17687c7940bacfe150fe92df78803030767dd3358fbc52e8da8e162af SHA512 00c22cc88e5b5024adee3caef0df9a9d42569eff965de6cb5a334408802b7f57daed4ab8b1e38055f35805fc64802c8620bd29d22f203584dc9510c147f57c5c
-EBUILD igraph-0.9.4.ebuild 1088 BLAKE2B 52fc7e3b6bb8e5749e49a4a5764137098568fdf22cddd54111bd70ba5c92910e4d18497e267addbed4a6ecdb0e7f49bbd1bb1579671566b74ef06e0f956b8c52 SHA512 505fa922750a195d2c9070c3a2f095e571b77421952864a109e9f7386c75bcb884c5ff1407425fab6838e2afbaa991d8ca11734f78cb82c07e8f2cf2c2d8f04a
 MISC metadata.xml 758 BLAKE2B 90df5f127db20d8d486a195a6c10d1e2159d2ca8ba1706adfec85c5317ef9b831ddf3595ab0f157cb30627db863fdeb72ce05d14bcd07291ec4735fd73a5e6b0 SHA512 3a5a7afe9387658aa41d587588af41b3cfae0c269e7da4badae23180b18c9854964942c292849321bc2c76feadcd4098223642f56736ca7a21a009d673446801
diff --git a/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch b/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch
deleted file mode 100644
index 9bf9ed7bc764..000000000000
--- a/dev-libs/igraph/files/igraph-0.9.2-disable-broken-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-upstream issue - https://github.com/igraph/igraph/issues/1694
-
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -678,10 +678,8 @@ add_examples(
-   FOLDER examples/simple NAMES
-   igraph_scg_grouping
-   igraph_scg_grouping2
--  igraph_scg_grouping3
-   igraph_scg_grouping4
-   igraph_scg_semiprojectors
--  igraph_scg_semiprojectors2
-   igraph_scg_semiprojectors3
-   scg
- )
diff --git a/dev-libs/igraph/igraph-0.9.4.ebuild b/dev-libs/igraph/igraph-0.9.4.ebuild
deleted file mode 100644
index 3e145244190d..000000000000
--- a/dev-libs/igraph/igraph-0.9.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Creating and manipulating undirected and directed graphs"
-HOMEPAGE="http://www.igraph.org/"
-SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/0"
-KEYWORDS="amd64 x86"
-IUSE="debug test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	dev-libs/libxml2
-	sci-libs/arpack
-	sci-libs/cxsparse
-	sci-mathematics/glpk:=
-	virtual/blas
-	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-broken-tests.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_CCACHE=OFF
-		-DIGRAPH_GLPK_SUPPORT=ON
-		-DIGRAPH_GRAPHML_SUPPORT=ON
-		-DIGRAPH_USE_INTERNAL_ARPACK=OFF
-		-DIGRAPH_USE_INTERNAL_BLAS=OFF
-		-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF
-		-DIGRAPH_USE_INTERNAL_GLPK=OFF
-		-DIGRAPH_USE_INTERNAL_GMP=OFF
-		-DIGRAPH_USE_INTERNAL_LAPACK=OFF
-		-DIGRAPH_ENABLE_TLS=$(usex threads)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build check
-}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index bab50fa6f2cf..112bd5553a33 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -4,8 +4,10 @@ DIST libfilezilla-0.39.1.tar.bz2 622574 BLAKE2B 2845f0309f8a9036f42930203b89d503
 DIST libfilezilla-0.39.2.tar.bz2 623763 BLAKE2B f3fac951ea46e36d45748697f4f8d78b46176d457c42a031355f3d35713d419b31b2e886bfcba9f769814c67b8cd797ebc67b2ec6f338213a22dda7cc0282b6e SHA512 ffa0728aaaa90e1561f8ab6bb855bf21068d0a653dd764560064b36efc20b9d0182d97151fb528a7fb26fb2f1779a884d23f1e4cf0b13fa7984e7f3568c9c217
 DIST libfilezilla-0.41.0.tar.bz2 627849 BLAKE2B 1697ce1a50b8d490d0197fb349ae7652dc6c7b9815dce68158478ba3122d483bf35cf1ab5c540b784d5677000c71afaabedc7e4097b38c486331238737351c01 SHA512 bda747299807c37c738ee6ade2f926bc500bd3d67de5b84b0201a4769c6c3d0899c3113c93afd88dc9958bc711426d6918af355e2d971c1b12de30304f2a47fc
 DIST libfilezilla-0.41.1.tar.bz2 627934 BLAKE2B 8838753f504ef3891c3602b473586c1b5eaeea5e2930e1d8386b28a1a620d73ebf7f2b48b3acdd8085eba7f904e4fdd99789e73dfdab5036de5fe32b6aa8534b SHA512 ae66fe9e0d537942f306e44f107553e870839031b1c6997f4638da3c5f015d94669eb869723d95d95632ebd30e17afc8303008501892caf76538a6898cf6210b
+DIST libfilezilla-0.42.2.tar.xz 529032 BLAKE2B 08d4f48d4b4d38ba8cc52779d7e3b589d5bd7c76a2ab74f668064e49c4eb1d85f676715f363baae0660a2d04def82aed53e57e4bc7e9f97f0934802adc523c1d SHA512 a453854f3a7143a63a2fc79458096e9b8f2f6a07f480cb15a0c0873a4cc147c0373d6f1647e1dd3dece015fbdedc3ce3085d4c7d26c801c0948fd1c593fd6d8c
 EBUILD libfilezilla-0.39.1-r1.ebuild 1279 BLAKE2B fdea7f03452e4dd301e1e44c355611a9c94e19a5d3ff58fddebd473449a80aca5fffe8968211a924258672cf01275926e3a01d5c7028c70739facd3038c1ce78 SHA512 e10b55941201762f1f87c2f82f30c79a6a7987d522476f2ab7fa017312c7baf8b0371194e7019151740ab5267647027afbcb73a57d702ea372362c6083dee7ee
 EBUILD libfilezilla-0.39.2.ebuild 1283 BLAKE2B a035da3ed2331f22470d989d9b582087ec7f1dbcc73a69fec37bfd94d94f5b6804c499e6867fded465b564c319b2f462d030eae16513a4c45bb95ef86afed522 SHA512 24484380ffb8ca6e59417a5825e4e9970c8a92a823ba72c6eec7a168d84c7789cfc223ddc06fcaf4a53386324439c5e23b6f9c68f1a840354a7af706774cf47c
 EBUILD libfilezilla-0.41.0.ebuild 1324 BLAKE2B 29fc9eb33e9403ba6ff9e623edbc4d4dc174ac6ff231c647114fe24b6c71347cb8c1eeb678f9ec52a946440d1aa9c08eadc5045e0af8d94edcc6f29ddb74142b SHA512 c4773e3026b49c24390719d3604dd0280080812b9ebdb5786620870cf611554a26ba19a30238617a26e30b4ee409ec25480237e3645de7bda9275470b4e4ad77
 EBUILD libfilezilla-0.41.1.ebuild 1324 BLAKE2B 4656bd666e81deccba4992a4ad9d315aee1bdb3cb726852d01e5c200d1d06dbedfb7a2462b4898c9d71520acca8de746f95a60dfa7167742ef73f8fde72abf09 SHA512 5ad6171dc18c1a7ded6377d63fe013287a2e4b93e90b84653c3ff13901b2bd9bbaf9e3679c87c39ddebdf9d8dfc7012680e2450982cc25eb88f38b7d1426483d
+EBUILD libfilezilla-0.42.2.ebuild 1323 BLAKE2B 8a7247ceb974a48485da1502782d41977b54ffe3bca017447b6daa644500e74772da85e4948dffc456914c3fd391887ea202bb3fa6fec7017f93bbefe0d4f20d SHA512 d3c4932a1d2d7710a80912ea3c86cbc724135f6bd277b8f2f1e312f47071b373d07dfa7276f88cd41df9f9a64d7b3c62b53afaa50bebdfd16e1a34c219d55bd1
 MISC metadata.xml 1125 BLAKE2B eddf5dd9e7af700c9cdfd68918acef8a6064a8f26e4531f047315df70a4c2d1e2d2a4b3257062e5af1973fef5490606f08a0c6460e220d25b3d615c7d4626e57 SHA512 6038a9eb07bf8c4adaf9bd3abaa3abc283ba8d8c432aa193fcc1932071afdbd6a6bb50a16e5e7f4f0cce4afbc341bb26b1b265b8f0da12728f8db06103d73ba5
diff --git a/dev-libs/libfilezilla/libfilezilla-0.42.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.42.2.ebuild
new file mode 100644
index 000000000000..6b7067b11e01
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.42.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/35" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.37.1-pthread.patch
+	"${FILESDIR}"/${PN}-0.41.0-gcc13.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 616bdef58d6d..0b4b3eac13d0 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,3 +1,5 @@
 DIST librdkafka-1.8.2.tar.gz 4097028 BLAKE2B 37a3190417e973ea4629012e358ff61cda45eb0134448dd0054fd1f1cac57f3543b133331b0b0d518f219f30f79f7665a214c75084d6a8474687b7e686395724 SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22
+DIST librdkafka-2.1.0.tar.gz 4276259 BLAKE2B 3b0f50bcebdc8115790622a6124e12bc8c2b36fe170484788fc1d2d01a5e9696d7cc988c5eea9efd0922ac5c70c8ab02fc4a574d0bd03bed74b22db2b5bef5a0 SHA512 eeefa8833e7c178015ff8d0914d927d1bf4e09a75c5f227ba75e527f9bfc46407798d69642b5db3edafb93fcdbe56e8b506df826d01c7793af0f11e96c38caed
 EBUILD librdkafka-1.8.2.ebuild 2284 BLAKE2B e448038ee570cd86a5f084c15f34a3657c2d21471792c8a6e2df17b1d0f293cc20c0cc0d5722cc978a7c3a536b9c874c4abc77deeeecb65c1665ebd292478cc4 SHA512 c361a230001576ee779bfd1accf3f4e4fa4073638faf5a69183b7e8441b884c55863d53594145154307b1e20910b9d046ae9465d567466faa0fb96c94167116c
+EBUILD librdkafka-2.1.0.ebuild 2288 BLAKE2B 534d76f81d048940d7057e7bc487f0b73f8e1065c935d1abb4ce4a8fb2b56865e80db23e71eb5808d48b7e459496ce263e3597e68ca5ff4943eedcdaec891082 SHA512 1e33f965bd16ce4f943c9ebfecc510abc825cb27bf6dd6c90511511f92a36f5814568931adc3cdbdf460009f31d0edd093af1424d7fce5a04af8a4f35de574ff
 MISC metadata.xml 450 BLAKE2B 4d06e12bfb0600ab60b4b353f9ee6c2f37a8477f2c26c3a45e1644825a40afd4200006e262a0e434047d0bf0b37e23a41100cce27540bd6bf0bcd361260e7b85 SHA512 4a9cb90dd238c3232c08905874b8e798937edb1838f73a375dc7315efe337cde0504e04b5835932480857706519066e35cc154e0959a104282e3c9aa3b81ecd5
diff --git a/dev-libs/librdkafka/librdkafka-2.1.0.ebuild b/dev-libs/librdkafka/librdkafka-2.1.0.ebuild
new file mode 100644
index 000000000000..99a1329b06bf
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-2.1.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} != "9999" ]]; then
+		sed -i \
+			-e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+			tests/run-test.sh || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--prefix="${EPREFIX}/usr"
+		--build="${CBUILD}"
+		--host="${CHOST}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--infodir="${EPREFIX}/usr/share/info"
+		--datadir="${EPREFIX}/usr/share"
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	./configure ${myeconf[@]} || die
+}
+
+src_test() {
+	# Simulate CI so we do not fail when tests are running longer than expected,
+	# https://github.com/edenhill/librdkafka/blob/v1.6.1/tests/0062-stats_event.c#L101-L116
+	local -x CI=true
+
+	emake -C tests run_local
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		install
+
+	if ! use static-libs; then
+		find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 4a505a69e69e..c14ca712c608 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index 297733d9bd4d..94758aab6458 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,5 +1,3 @@
-DIST latex2rtf-2.3.11a.tar.gz 1582004 BLAKE2B 0740e4e836c0638e0fbb712a77b258943b549d3cd4531cf1121452df92e36ec83d216bc7ad196a8c6c1341a876e42f833840cd3bd7e402dd38840405a3e501ba SHA512 b6e6000b4f919ecfb5174f32887cb4e1b765530547b3b50103e778d0244f0ce37d0ec14bbd1fa6b2ef2569f0c437b34b29586c4bdb2e3caf50584847819f54c0
 DIST latex2rtf-2.3.15.tar.gz 1648297 BLAKE2B b9c6a2c6ef978eb1aee8245582763b3339aaeebb34c7ff8b501ba1f18a2337407d13b440eeb2421a0df7336715a0ac3a4390ba7dd15c22ee5498911a93f599f4 SHA512 ef4603bd4d484eadd2accc16b1e20165450cf2ee56b29f950549028954f00ab6e99ec695959b8971d112617f641f8cca193e990a17053ee5cbe0c1bfc8b8630c
-EBUILD latex2rtf-2.3.11.ebuild 1044 BLAKE2B 54dd21bd2322752575ab755df3544273ff5d6faa003cd0b60a39062fc0d56c5fa1df77122bfd0cedfa06652c1f984c4828f4c602f7bcd0f68528d6c559a3ad65 SHA512 93415f2467a64648c6a99d19a7102def616db16c9b57951215c756b2519c3ad04fc695f3ebb34d469b276a9babf8f24140e282397346617bd0b60945baa1e171
-EBUILD latex2rtf-2.3.15.ebuild 1035 BLAKE2B 06b85e264a5d607327f546328025da8d56d20ea5d90aacac59c19409cc51d4de2c6655ddf4481524214ec310f719cfcdfffeba029c3f87f79410f2f4927eb063 SHA512 d10bbda5d708fcebb272a9206dfeb0b89d65f4bd23e09d456b7dbc68014ff3179ec96c93d7483958d1c14b8a7bc6e97794e8c897feef22d8d28c572b9dace533
+EBUILD latex2rtf-2.3.15-r1.ebuild 1035 BLAKE2B bbe02b4f81c26296872b1c99ff4470e331864b8df01065c768fcf3c613cbb826c7f992e95b586cef5d27e9feac48f457e582abfb468c6712a82bd0cb143f610b SHA512 369defc2d4f6e98858aa76c7cabd93f474aa49259348a6bf19c7f30dd7539b533db1f2fa1a912e75c31b9d5d06ccfe666671f175af154f81fb10a8aaabeb502d
 MISC metadata.xml 329 BLAKE2B 7bc757fbe67b37ea89df8b8858fff8b4a11fd57f388555fdaf9a69a7f4de05b56d2bbfcd072c1ce3ee9b32a094a7f0fffcaa8cba6416119e4953774ce6bbd769 SHA512 5aeed05dc2baf5d2665b00c4ce21b1fa8f9630c81c1dbf561d519080a5b25608cc830e01053ca83b39b797733da26978b3e1b0f36bfcbb0574050c0a560768e1
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
deleted file mode 100644
index 61512130ad48..000000000000
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="LaTeX to RTF converter"
-HOMEPAGE="http://latex2rtf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/latex2rtf/${P}a.tar.gz" # 'a' is only for 2.3.11 version for fixing a tarball generation bug
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P%b}"
-
-RDEPEND="
-	virtual/latex-base
-	media-gfx/imagemagick
-"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	test? (
-		dev-texlive/texlive-langgerman
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/latex2html
-	)
-"
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	tc-export CC
-	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr"
-
-	cd "${S}/doc"
-	emake realclean
-	emake -j1
-}
-
-src_install() {
-	dodoc README* HACKING ToDo ChangeLog doc/credits
-	emake DESTDIR="${ED}/usr" -j1 install install-info
-}
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.15-r1.ebuild
index 732b4e1aa03a..f1105ddeb5b2 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.15-r1.ebuild
@@ -1,49 +1,48 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="LaTeX to RTF converter"
 HOMEPAGE="http://latex2rtf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
+S="${WORKDIR}/${P%b}"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P%b}"
 
 RDEPEND="
 	virtual/latex-base
-	media-gfx/imagemagick
-"
-DEPEND="${RDEPEND}
+	media-gfx/imagemagick"
+BDEPEND="${RDEPEND}
 	virtual/texi2dvi
 	test? (
 		dev-texlive/texlive-langgerman
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
 		dev-tex/latex2html
-	)
-"
+	)"
 
 src_compile() {
-	export VARTEXFONTS="${T}/fonts"
+	export VARTEXFONTS="${T}"/fonts
+
 	tc-export CC
 	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr"
+	emake DESTDIR="${EPREFIX}"/usr
 
 	# Needed for tests
 	chmod +x test/bracecheck || die
 
-	cd "${S}/doc"
-	emake realclean
-	emake -j1
+	emake -C doc realclean
+	emake -C doc -j1
 }
 
 src_install() {
 	dodoc README* HACKING ToDo ChangeLog doc/credits
-	emake DESTDIR="${ED}/usr" -j1 install install-info
+	emake DESTDIR="${ED}"/usr -j1 install install-info
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c57ff2c9ffb0..62a9cf1e46e4 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index fe31626d9c77..0a2888adb7c1 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -3,7 +3,6 @@ AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530c
 AUX ccache-4.1-avoid-run-user.patch 823 BLAKE2B de70e7b3f687f099e8b6eafb069d725350bb32c1ca39e42223113a5cbd79d6be7edb0560d6f199b0d43d20f4c99a5a5d888d96b8ec74d678e9793011e2463613 SHA512 2f3351af3ee755ff44802239cddd16e5990edd067d44228707ba2cb96f44faf26ce220b2e9e9994a45baac11a54bf778ba48c27fdd526e59a889638a84cfd5c7
 AUX ccache-4.6.2-avoid-run-user.patch 1042 BLAKE2B 192a0c0fa957b8c1e9c12984a898953f84b2ff14b38206e92cf33e6f80d5c25cf4800add72a3e1d38ff0d6a6c22d071bc7e46ca324662e478f2ec75df632f1f2 SHA512 2d2269021e5eab22d144e81318e620ef0191a34e2de15ff78e2019ac13fddc277802df1387b4aa673649662244c0c2c8c76003af7247f00287dafa6c460aa18f
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
 DIST ccache-4.7.4.tar.xz 547820 BLAKE2B 03e03223f0fd6eb001c7d93bcd03a0ef6656ebd3ffcc920b9e772fb68275ddf1e8a941f8f7de68358cbc7a9b9d5aa65e35b91554ff24684f29ff1953aefae75f SHA512 48c663b51e874cfbd8daf0ef9759d025c2605c36da47ebbc77b52ceb941b810436600429f74204f13e2e2e601af6186a4bdb992f8da239f88cb9df4c6c95d58f
@@ -11,7 +10,6 @@ DIST ccache-4.7.4.tar.xz.asc 833 BLAKE2B e155f9cb695794a28771a928d50e18705441b9f
 DIST ccache-4.8-docs.tar.xz 80280 BLAKE2B e8e00dd10a00670ff3a0c3f5ab0966469fa5246de64724e24d0287020d4636fb5a1f59421aaa094d05b88bd20efd2a4a06e46dfb957bcf77ad2ea61fd02551c9 SHA512 e0036a7f86b458028c6e24158f95b62e40d9f659031e16adc59c067096bb728f1cb583a2edecaf2118f15b8e00f028fa6f1cfa2466fba76b7c870cca93a883eb
 DIST ccache-4.8.tar.xz 556804 BLAKE2B 5cca7d49088c5391abf93a2a493ba8e120575ae834abae86f3669e8c883a93ec29d48ab934aa086a87feb6a08d0c0053b3ce7174cec2f342c2d695a93fa3ef9a SHA512 561424d448a049971742b846429c2fa5f1df43c05f201610dab0a3fab7e4806589c14ca20875cb5733763603c0813fe9350a244b63dda03e9def95d547738d0b
 DIST ccache-4.8.tar.xz.asc 833 BLAKE2B 4a646db5b7a220a21ad93a02ea4bad23a666ad116af70211ea4a9a546ba7aeaf0c1c88c79d264f614a2ca5387dc91bf655a1632f53889dd74f49e085e2f6bd01 SHA512 22b6aeb54248576a1199e173db7b58b985bdc4e6a298e9fbd32992ab6dbadcd4496ffcadc24241215bd43166b68faf77aa3e492e44ffeac53e1e5e4c46015836
-EBUILD ccache-4.5.1.ebuild 2295 BLAKE2B 8b89808a850d5bb512a9672d719a800c9f17fd23dddc3bb5b1c0626b4160910bead0ca27137d734340ca9a60783349b97730376d5cb35473698b843203758d7c SHA512 96c0b4dbe479a0383fb28fda5f262e4490625e0ba137e5435ba8ee9702d14fe68c42a04a462792ff96aa176e3676a819602e2e50cb989d5061842c188d8fc5ba
 EBUILD ccache-4.6.3.ebuild 2575 BLAKE2B c8b4113239bf1ea5d2b394f68e0f2dc623a602bf082c72cb4e5c38640b83e9909e69324a894a9a79bd88610a36451cee2ea35ddfce7060794b52fb8923b8fa95 SHA512 37fb4a65048e332d928279eccb5bcebeb20ab61379898aa548eb5ced5a858b680cd844f2f679d4ea528af54f21ca663614112dc45b937b8da38b1718fa919f2e
 EBUILD ccache-4.7.4.ebuild 2489 BLAKE2B c96ba952f7f90c54812fcc1ead1bc4adf7b036937b2d80a05c0bebc54cdf3cdaac456e8918b6f4905cb38c19aa98d9c912624d22bfd76c0ae35d32e8c7cea6dd SHA512 90802b6ff902bb7cced6947824d38ea90bf8da66b48dec9cc7f1584193f4fb3f4d50217685306e1504118a55a46c6680f27b6a59368c835058171ef33f772e4b
 EBUILD ccache-4.8-r1.ebuild 3607 BLAKE2B 591692c06da7e031ce7811e057ea8d638252bd9f6577074230dfb31d7da1977a2d9da8ae3f5eb8665bc48d9ca13cb54fd7952185817482bb4139828fc9167690 SHA512 f2d6a6745589b6a7fbc6998a6c9e296da3f01e05a61ead453315166d7cda335cf0028b1db7fee3814e5b62c0e1312ebde1eb587fba395270793b5c1a5473724c
diff --git a/dev-util/ccache/ccache-4.5.1.ebuild b/dev-util/ccache/ccache-4.5.1.ebuild
deleted file mode 100644
index 33eaea9d849e..000000000000
--- a/dev-util/ccache/ccache-4.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs flag-o-matic
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-	# mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
-	use static-c++ && append-ldflags -static-libstdc++
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_CCACHE=OFF
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT:-/} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index db2546413503..1239054cc432 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -3,9 +3,11 @@ DIST poke-2.4.tar.gz 7372092 BLAKE2B 64b8b22713bb581c30b624200c0a283a8de548895db
 DIST poke-2.90.1.tar.gz 7512925 BLAKE2B 38c9283f1c0b183b1b74c2ebd347edf6e9a9191d19070f7da32e6b0f520ec8197be3a813bc98160b47363cd11069bdaf84bb528498fe51cf2dcadf0bfa06a25e SHA512 f5823bed61ab64c2cdde83c918716fe64ad5552499023b2f5202130d6b2bab405c9d1cb1e12c7f190749689d86bf36f4edfe140ce748ac4c5f03d219197558d3
 DIST poke-3.0.tar.gz 7510801 BLAKE2B 4e80bd0603b0f690f7b6dc9b3913bb165f61160cd6e677751e6f8ea444bc395141204cc32c3ed97bad4b4044d505a800a64a4c973200e7338b50f05d9ea90c25 SHA512 5b786cdfae732a1f7196b0c4bf271c97f204f8fe9de9b34d92704f35150c8abfc2c080940d67efac63e3e82d0d4afe2fde4b75066faf9f4d1e9df6b6f62edb96
 DIST poke-3.1.tar.gz 7562582 BLAKE2B c348973185e7f33d670a9dccab60c02e8ccc247c5aa46936ac4b04674687c9e7edae707639a16c3853232b422d0c969930fe3879b59c1dba351fe7c3da56d34f SHA512 5680ce13b0a8e9a1f2770d295bccf7ccbe3aff54f3f4301a12c4719f54a6717ce5addb6ae3fe0478d0e426ccc756ef06a5e852b0d6ada0f8d3c587640ad209dd
+DIST poke-3.2.tar.gz 7559660 BLAKE2B c1d5739a1a497fb3daadec53fe812b65ec787dd268030a6517764541497c82451f4df391f3c434ef7729bc8e3762c31852ef3ce41aa83928e7646c40bde557dd SHA512 bd3651a2962165b318cc59c53604199eb6278ee3be45c18c36864612b0926d78a06f0e1338fdcc1fcd1cd48e2792bb3cd36a2bb5383143a66dc3aab023c0019c
 EBUILD poke-2.4-r1.ebuild 2586 BLAKE2B b5be6e5279cb89ecf5560c9095e217edac07c0d970cc6c5aea470c1893822fda2e185c017103f47f99ad06edf3cf31932bb633d6d0175af4babf314e16ac1633 SHA512 df288cfb449993407d0f4994f13fe7bd77055972ff1371b039bd8f6f5d6a53cad8cb5758ca83039d3cbfcf8a6c33928f75103310a24fb7478fd49a3c9435e0ba
 EBUILD poke-2.90.1.ebuild 2285 BLAKE2B 01ed0496432709cece66fb8667146e65057c120120c6c4b43f674cd5aa3d765d088c2c0142cf9196a6ef901984a3637480ba2f61e4f0f36291684393d84d73e1 SHA512 0cc9cea5afea3dce7106a3a9c070befa92f9d94f94475909a3784d1c7f1bd275d8940828431c0eea6e15271e199253c610ed88ee837cbc40de47ef4cbdc45dee
 EBUILD poke-3.0.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
 EBUILD poke-3.1.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
+EBUILD poke-3.2.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
 EBUILD poke-9999.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
 MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2
diff --git a/dev-util/poke/poke-3.2.ebuild b/dev-util/poke/poke-3.2.ebuild
new file mode 100644
index 000000000000..80e149428e9b
--- /dev/null
+++ b/dev-util/poke/poke-3.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common flag-o-matic toolchain-funcs
+
+DESCRIPTION="Extensible editor for structured binary data"
+HOMEPAGE="https://www.jemarch.net/poke"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-1.16
+		sys-apps/gawk
+		sys-apps/help2man
+		sys-apps/texinfo
+		sys-devel/bison
+		sys-devel/flex
+	"
+elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
+	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="emacs pvm-profiling nbd nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boehm-gc:=
+	dev-libs/libatomic_ops
+	sys-devel/gettext
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	nbd? ( sys-libs/libnbd )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( nbd? ( sys-libs/libnbd[uri-support] ) )
+"
+BDEPEND="
+	${REGEN_BDEPEND}
+	virtual/pkgconfig
+	pvm-profiling? ( sys-devel/gcc )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		dev-util/dejagnu
+		nbd? ( sys-block/nbdkit )
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_pretend() {
+	if use pvm-profiling && ! tc-is-gcc; then
+		die "USE=pvm-profiling requires GCC"
+	fi
+}
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./bootstrap || die
+	fi
+}
+
+src_configure() {
+	# See bug 858461.
+	# Upstream support might happen one day.  For context, only one file needs
+	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
+	# others do not.  The build system will handle this at some point in the
+	# future.  Until then, just filter out LTO.
+	filter-lto
+
+	local myconf=(
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--enable-hserver
+		$(use_enable nbd libnbd)
+		$(use_enable pvm-profiling)
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd etc || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		cd etc || die
+		elisp-install "${PN}" *.el *.elc
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 2056fba57876..b9c66b857a10 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 35886107d57c..a96dca5ab426 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,9 +1,4 @@
-AUX odamex-10.0.0-gcc12.patch 428 BLAKE2B f5be9174e379389aa925890dce9f6695959dca645f6d867115478db094923394a017430e47fe1643166a1e2c70e2371ecfc1b5303101f4faaa1f8ba055b8d85f SHA512 077a514cb472152fdfce996bb1a96b7163bd3193b84db7896df5f312a2a6b5153e3891fc48b6e780a652e526bd3bd646a3e3c7f3f8c42664c7cd2e1bb500e71d
-AUX odamex-10.0.0-master-std.patch 842 BLAKE2B db7b4daf846c9c0a2bb9ab561a384752fa69c10271997c7669dfcdecec6d006b1abfaacc996d85139024ef6e612bd6a418e54bef99f42a538bea921dc9596fc2 SHA512 afb76e04b7a2f1424099b78fd233ebeae7b3aadf2196b91e41770aa82b8ae4e5123a4a2e43a498ecbe8a0f00a853fcfaf31a7904ccaf75e95e7cc5ddc8013644
-AUX odamex-10.0.0-musl.patch 1976 BLAKE2B 5c0a9a71c37296e5de95528476e1d70198ff15358db15db1203ac44ecfc8d6b2b57613a03a3143e06ae9ff1860ba81a5b65ada64d60325fa8978e573167b0833 SHA512 3acb26554e7237386e239ddb1a62ed695cb79c28f65f2b1a29994438650c5858594f545570532f9b6c89dc33fe1ca7cb3f71b17ca2c00733b867476ca3aad9af
-AUX odamex-10.0.0-unbundle-fltk.patch 3986 BLAKE2B 56507d7aa52eb3708016e0dd1a3c86d6554ef7e44a38ca5be6dc5f0e358d475b78a602bfa9879994047466506722a1fda0454ee752181489e52ec2634ed8a639 SHA512 1a058a69e84343e6f4d1599ccbb3a0b074ed36b87e095c29888d22c848522c7910297e27a5a7799f0ffc0ecc3b6dc92630b7b55642c6dafbc4c825a2f0f93fc9
-AUX odamex-10.0.0-unbundle-jsoncpp.patch 3311 BLAKE2B cf826f9012d2ccd7ee3031ba75dad9044450583f7bc8126841ac63a274b257ab304ab4e0c5cdda88147c5e476d78b430020ebf41801dda3ae012e4a98177a80c SHA512 cfd09a51b3b8ca103d5e77919445c903843f867806a3b6e0ac13c01b61c7986ca4b1a8d662ca70a1e3c0694da81323edfe66895a86e40738a24914fded05e11e
-AUX odamex-10.0.0-unbundle-miniupnpc.patch 3660 BLAKE2B dde9066a0a9da7119ed668cce8443c91c070c93e70d55ec6d47600ea1a02038c8473706f9ff911b9b164ed7599730115f466926cf8ac564a79698d658ccb3098 SHA512 afe2211f70d56284754ecc2ba59f2b519bfce5084b4f9ebd6b514a65b2e624c97fa4317bf505a7dbfedae91de3ad878cd454ba4ff7f56a5064ca5a2ca05858d9
-DIST odamex-src-10.0.0.tar.xz 17680868 BLAKE2B 95df336ccc24c2658174bdd051cb9b98ca906d653d84a120330d8fe6f11ad91ba70ba7edfc960f8815d02795f7392761a0174171de30ea78b37389a61deacae7 SHA512 b825953a446a4eb46d2d004b20df876bceec823cb5f0bf661ecac03eff2f07c11fe47c6861f3c3ee417ce9ca869474ff422d78bba1b742485315ba5ba86bd702
-EBUILD odamex-10.0.0.ebuild 2414 BLAKE2B dc38996703e79dd5616c2b06097f393a27f81dd4df9a04f3e9b915d6278d86c780ebeb0e72fd904d4948c2f450e57831f454b221b5e0dfe1f2a3184e9df91294 SHA512 1bd6f1d7a9bb6a5e9a14a32d3e407ef4078f924be008ba1eddfa672723241f23eb41b803f9d478d0d56a8ac4e375ab162ac87a1eb10e790f1bd98799fe877b90
-MISC metadata.xml 1385 BLAKE2B f97715d64f4798d968ae5e17c32f66df5728f1f1994ffdca7001926931f998796a727b965fbb69b6bb1641028b3c36c36505553fe08f090138a967065d0ccf0c SHA512 4f9cbdef3d8005b6f533248379cc1798487d8e2e2b4fca5791c3a62e52f1164ba3a1de253db2be382d5ec50e053d0f9e37a8a08432857c7ec94a84d9cdccdcbc
+AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
+DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
+EBUILD odamex-10.3.0.ebuild 2182 BLAKE2B dd8212dc231eebd2edaf8d996f55a597a0442397c236a8c14d606e80f71529c4ba4bfdb98d649b7c78d7be7c1acd0f5bf02b385afddc83cf700c305fe5ad96b0 SHA512 19717d42600547edf0e8c6791c7a92b5b487bdfdf17e49481e4a7ddcb56991c8b567d26e20565b856e3bb80ef2f46b82ea83fe1fbc1fc4db3b58de12d791d94a
+MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch b/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
deleted file mode 100644
index 8e1a080e1f90..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/852566
---- a/libraries/portmidi/pm_linux/finddefault.c
-+++ b/libraries/portmidi/pm_linux/finddefault.c
-@@ -2,6 +2,7 @@
-    Roger Dannenberg, Jan 2009
- */
- 
-+#include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
---- a/master/main.cpp
-+++ b/master/main.cpp
-@@ -29,6 +29,7 @@
- #include <iostream>
- #endif
- 
-+#include <ctime>
- #include <string>
- #include <vector>
- #include <list>
diff --git a/games-engines/odamex/files/odamex-10.0.0-master-std.patch b/games-engines/odamex/files/odamex-10.0.0-master-std.patch
deleted file mode 100644
index 2fe299fd12df..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-master-std.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 08ff1a04abfde739f7b6d273ebfad65e9a09c24a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 20 Mar 2022 13:19:49 +0000
-Subject: [PATCH] Set odamast C++ standard to 98
-
-Otherwise the use of `byte` is ambiguous with newer compilers, resulting
-in a build error.
-
-(cherry picked from commit 4c06d27e60b1e10c4d661523894430323398b140)
----
- master/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index cbe6a0311..f216eab9a 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -6,6 +6,7 @@ file(GLOB MASTER_SOURCES *.cpp *.h)
- # Master target
- add_executable(odamast ${MASTER_SOURCES})
- odamex_target_settings(odamast)
-+set_property(TARGET odamast PROPERTY CXX_STANDARD 98)
- 
- if(WIN32)
-   target_link_libraries(odamast wsock32)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-musl.patch b/games-engines/odamex/files/odamex-10.0.0-musl.patch
deleted file mode 100644
index 92af6ad305bd..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-musl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b87798fe9fed746e98871aaa10978324e4b9378f Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 1 Mar 2022 21:29:32 +0000
-Subject: [PATCH] Fix musl build by checking whether execinfo.h's backtrace is
- present
-
-Closes: https://github.com/odamex/odamex/issues/533
-(cherry picked from commit df3f5976416d342198879db80e4bf35f69eb2ed7)
----
- common/CMakeLists.txt    | 9 +++++++++
- common/i_crash_noop.cpp  | 2 +-
- common/i_crash_posix.cpp | 2 +-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
-index 2850607e5..8d02b3212 100644
---- a/common/CMakeLists.txt
-+++ b/common/CMakeLists.txt
-@@ -6,3 +6,12 @@ configure_file(git_describe.h.in "${CMAKE_CURRENT_BINARY_DIR}/git_describe.h")
- add_library(odamex-common INTERFACE)
- target_sources(odamex-common INTERFACE ${COMMON_SOURCES} ${COMMON_HEADERS})
- target_include_directories(odamex-common INTERFACE . ${CMAKE_CURRENT_BINARY_DIR})
-+
-+if(UNIX)
-+  include(CheckSymbolExists)
-+  check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
-+
-+  if(HAVE_BACKTRACE)
-+    target_compile_definitions(odamex-common INTERFACE HAVE_BACKTRACE)
-+  endif()
-+endif()
-diff --git a/common/i_crash_noop.cpp b/common/i_crash_noop.cpp
-index 4eb8e70f4..84a406fb3 100644
---- a/common/i_crash_noop.cpp
-+++ b/common/i_crash_noop.cpp
-@@ -23,7 +23,7 @@
- 
- 
- #if defined _WIN32 && !defined _XBOX && defined _MSC_VER && !defined _DEBUG
--#elif defined UNIX && !defined GEKKO
-+#elif defined UNIX && defined HAVE_BACKTRACE && !defined GEKKO
- #else
- 
- #include "odamex.h"
-diff --git a/common/i_crash_posix.cpp b/common/i_crash_posix.cpp
-index 8e6270872..4bf8727f6 100644
---- a/common/i_crash_posix.cpp
-+++ b/common/i_crash_posix.cpp
-@@ -22,7 +22,7 @@
- //-----------------------------------------------------------------------------
- 
- 
--#if defined UNIX && !defined GCONSOLE
-+#if defined UNIX && defined HAVE_BACKTRACE && !defined GCONSOLE
- 
- #include "odamex.h"
- 
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
deleted file mode 100644
index 9b0d3284dc48..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-jsoncpp.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From c8d1cd6465d8d64a23a111edb5fba67565660fe8 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 27 Feb 2022 22:51:18 +0000
-Subject: [PATCH 2/3] Allow building against the system JsonCpp library
-
-`USE_INTERNAL_JSONCPP` defaults to true and ignores `USE_INTERNAL_LIBS`
-because users are unlikely to have it installed.
-
-More recent versions of JsonCpp require C++11, but Odamex targets C++98
-for compatibility with older platforms. The standard is therefore only
-changed to C++11 when `USE_INTERNAL_JSONCPP` is false, and only for the
-server where JsonCpp is used. Note that C++11 still works when building
-against an older JsonCpp version.
-
-Tested against JsonCpp 1.9.5 on Gentoo Linux.
-
-Closes: https://github.com/odamex/odamex/issues/261
-(cherry picked from commit 5162c6297c7177af907e5e0502eac9d59ffcc22b)
----
- CMakeLists.txt           |  1 +
- libraries/CMakeLists.txt |  2 +-
- server/CMakeLists.txt    | 15 ++++++++++++++-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c43c9f111..9353d0c6b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
- cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

- cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

- cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

-+cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )

- cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

- cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )

-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index ae7db4c86..493d8f12b 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -295,7 +295,7 @@ endif()
- 
- ### JsonCpp ###
- 
--if(BUILD_SERVER)
-+if(BUILD_SERVER AND USE_INTERNAL_JSONCPP)
-   message(STATUS "Compiling JsonCpp...")
- 
-   # Figure out the correct library path to attach to our imported target
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 32297080f..a9bf8c44d 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -45,7 +45,12 @@ endif()
- add_executable(odasrv
-   ${COMMON_SOURCES} ${SERVER_SOURCES} ${SERVER_WIN32_SOURCES})
- odamex_target_settings(odasrv)
--set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
-+
-+if(USE_INTERNAL_JSONCPP)
-+  set_property(TARGET odasrv PROPERTY CXX_STANDARD 98)
-+else()
-+  set_property(TARGET odasrv PROPERTY CXX_STANDARD 11)
-+endif()
- 
- target_include_directories(odasrv PRIVATE src)
- if(WIN32)
-@@ -53,6 +58,14 @@ if(WIN32)
- endif()
- target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
- 
-+if(USE_INTERNAL_JSONCPP)
-+  target_link_libraries(odasrv jsoncpp)
-+else()
-+  find_package(PkgConfig REQUIRED)
-+  pkg_check_modules(JSONCPP jsoncpp REQUIRED IMPORTED_TARGET)
-+  target_link_libraries(odasrv PkgConfig::JSONCPP)
-+endif()
-+
- if(USE_MINIUPNP)
-   if(USE_INTERNAL_MINIUPNP)
-     target_link_libraries(odasrv upnpc-static)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch b/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
deleted file mode 100644
index 80b0806e0c11..000000000000
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-miniupnpc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 4e9fec4ce56fda2568a3a656e1f7c59cdbc5fb21 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 20 Feb 2022 11:24:24 +0000
-Subject: [PATCH 1/3] Allow building against the system miniupnpc library
-
-`USE_INTERNAL_MINIUPNP` defaults to true and ignores `USE_INTERNAL_LIBS` because
-users are unlikely to have it installed.
-
-Although miniupnpc uses pkg-config, it doesn't add any include paths to the
-flags because it expects your include directives to include the miniupnpc
-directory. We should therefore do the same with the internal build so that
-either can be used.
-
-Bug: https://github.com/odamex/odamex/issues/261
-(cherry picked from commit 1832a4a1c06504de953cdec2413a47ee393101c7)
----
- CMakeLists.txt           | 1 +
- common/i_net.cpp         | 7 +++----
- libraries/CMakeLists.txt | 4 ++--
- server/CMakeLists.txt    | 8 +++++++-
- 4 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fd17dd36b..c43c9f111 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,6 +45,7 @@ cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_
- cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

- cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

- cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )

-+cmake_dependent_option( USE_INTERNAL_MINIUPNP "Use internal MiniUPnP" 1 USE_MINIUPNP 0 )

- 

- set(PROJECT_COPYRIGHT "2006-2022")

- set(PROJECT_RC_VERSION "10,0,0,0")

-diff --git a/common/i_net.cpp b/common/i_net.cpp
-index 27b218d0d..dba512346 100644
---- a/common/i_net.cpp
-+++ b/common/i_net.cpp
-@@ -93,10 +93,9 @@ typedef int SOCKET;
- #include "minilzo.h"
- 
- #ifdef ODA_HAVE_MINIUPNP
--#define MINIUPNP_STATICLIB
--#include "miniwget.h"
--#include "miniupnpc.h"
--#include "upnpcommands.h"
-+#include "miniupnpc/miniwget.h"
-+#include "miniupnpc/miniupnpc.h"
-+#include "miniupnpc/upnpcommands.h"
- #endif
- 
- unsigned int	inet_socket;
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 1785ed0d8..ae7db4c86 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -350,7 +350,7 @@ endif()
- ### MiniUPnPc ###
- if(BUILD_SERVER AND NOT USE_MINIUPNP)
-   message(STATUS "Skipping MiniUPnPc...")
--elseif(BUILD_SERVER AND USE_MINIUPNP)
-+elseif(BUILD_SERVER AND USE_MINIUPNP AND USE_INTERNAL_MINIUPNP)
-   message(STATUS "Compiling MiniUPnPc...")
- 
-   # Figure out the correct library path to attach to our imported target
-@@ -386,7 +386,7 @@ elseif(BUILD_SERVER AND USE_MINIUPNP)
-   # Synthesize an imported target that can be linked against.
-   add_library(upnpc-static STATIC IMPORTED GLOBAL)
-   set_target_properties(upnpc-static PROPERTIES
--    INTERFACE_INCLUDE_DIRECTORIES "${MINIUPNPC_INCLUDE_DIR}"
-+    INTERFACE_COMPILE_DEFINITIONS MINIUPNP_STATICLIB
-     IMPORTED_LOCATION ${MINIUPNPC_LIBRARY})
-   if(WIN32)
-     set_target_properties(upnpc-static PROPERTIES INTERFACE_LINK_LIBRARIES "ws2_32;iphlpapi")
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index c9fa17b64..32297080f 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -54,7 +54,13 @@ endif()
- target_link_libraries(odasrv ZLIB::ZLIB jsoncpp odamex-common odaproto)
- 
- if(USE_MINIUPNP)
--  target_link_libraries(odasrv upnpc-static)
-+  if(USE_INTERNAL_MINIUPNP)
-+    target_link_libraries(odasrv upnpc-static)
-+  else()
-+    find_package(PkgConfig REQUIRED)
-+    pkg_check_modules(MINIUPNPC miniupnpc REQUIRED IMPORTED_TARGET)
-+    target_link_libraries(odasrv PkgConfig::MINIUPNPC)
-+  endif()
- endif()
- 
- if(WIN32)
--- 
-2.34.1
-
diff --git a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
index 1c9a8753b44a..6cc6a1d18241 100644
--- a/games-engines/odamex/files/odamex-10.0.0-unbundle-fltk.patch
+++ b/games-engines/odamex/files/odamex-10.3.0-unbundle-fltk.patch
@@ -14,19 +14,9 @@ window is unaffected.
 
 Tested against FLTK 1.3.5 on Gentoo Linux.
 
-(cherry picked from commit 656afab54e30598022f4dd2af298cf6a487a1fe1)
----
- CMakeLists.txt           |  1 +
- client/CMakeLists.txt    | 23 ++++++++++++++++++++++-
- client/gui/gui_boot.cpp  |  2 ++
- libraries/CMakeLists.txt |  2 +-
- 4 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9353d0c6b..599b6e85b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,6 +42,7 @@ option(USE_INTERNAL_DEUTEX "Use internal DeuTex" ${USE_INTERNAL_LIBS})
+--- a/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/CMakeLists.txt	2023-05-12 14:08:26.838832213 -0500
+@@ -43,6 +43,7 @@
  cmake_dependent_option( USE_INTERNAL_ZLIB "Use internal zlib" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

  cmake_dependent_option( USE_INTERNAL_PNG "Use internal libpng" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

  cmake_dependent_option( USE_INTERNAL_CURL "Use internal libcurl" ${USE_INTERNAL_LIBS} BUILD_CLIENT 0 )

@@ -34,16 +24,14 @@ index 9353d0c6b..599b6e85b 100644
  cmake_dependent_option( USE_INTERNAL_JSONCPP "Use internal JsonCpp" 1 BUILD_SERVER 0 )

  cmake_dependent_option( USE_INTERNAL_WXWIDGETS "Use internal wxWidgets" ${USE_INTERNAL_LIBS} BUILD_LAUNCHER 0 )

  cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index bd071a7a5..ff1e72ba3 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -206,7 +206,28 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+--- a/client/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/client/CMakeLists.txt	2023-05-12 14:10:01.895750073 -0500
+@@ -206,8 +206,28 @@
    target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY} CURL::libcurl)
    if(NOT GCONSOLE)
      target_include_directories(odamex PRIVATE gui)
 -    target_link_libraries(odamex fltk fltk_images)
-+
+-  endif()
 +    if(USE_INTERNAL_FLTK)
 +      set(FLTK_LIBRARIES fltk fltk_images)
 +      set(HAVE_FLTK_SCREEN_SCALE TRUE)
@@ -65,16 +53,15 @@ index bd071a7a5..ff1e72ba3 100644
 +    endif()
 +
 +    target_link_libraries(odamex ${FLTK_LIBRARIES})
-   endif()
++   endif()
  
    if(ENABLE_PORTMIDI)
-diff --git a/client/gui/gui_boot.cpp b/client/gui/gui_boot.cpp
-index f0a0035d1..834038209 100644
---- a/client/gui/gui_boot.cpp
-+++ b/client/gui/gui_boot.cpp
-@@ -315,12 +315,14 @@ static BootWindow* MakeBootWindow()
+     target_link_libraries(odamex ${PORTMIDI_LIBRARY})
+--- a/client/gui/gui_boot.cpp	2022-11-24 21:02:08.000000000 -0600
++++ b/client/gui/gui_boot.cpp	2023-05-12 14:11:19.362517260 -0500
+@@ -537,12 +537,14 @@
   */
- std::string GUI_BootWindow()
+ scannedWADs_t GUI_BootWindow()
  {
 +#ifdef HAVE_FLTK_SCREEN_SCALE
  	// Scale according to 1600x900.
@@ -87,19 +74,14 @@ index f0a0035d1..834038209 100644
  
  	BootWindow* win = MakeBootWindow();
  	win->initWADDirs();
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index 493d8f12b..a53441d13 100644
---- a/libraries/CMakeLists.txt
-+++ b/libraries/CMakeLists.txt
-@@ -255,7 +255,7 @@ endif()
+--- a/libraries/CMakeLists.txt	2022-11-24 21:02:08.000000000 -0600
++++ b/libraries/CMakeLists.txt	2023-05-12 14:11:46.463789831 -0500
+@@ -264,7 +264,7 @@
  
  ### FLTK (dep: libpng) ###
  
 -if(BUILD_CLIENT)
 +if(BUILD_CLIENT AND USE_INTERNAL_FLTK)
-   message(STATUS "Compiling FLTK...")
- 
    set(_FLTK_BUILDGEN_PARAMS
--- 
-2.34.1
-
+     "-DOPTION_USE_SYSTEM_LIBJPEG=OFF"
+     "-DOPTION_PRINT_SUPPORT=OFF"
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
index 1548d4273e2e..6bc351136c9c 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -17,6 +17,7 @@
 		<changelog>http://odamex.net/changelog.php</changelog>
 		<doc lang="en">http://odamex.net/wiki/Odamex</doc>
 		<bugs-to>http://odamex.net/bugs/</bugs-to>
+		<remote-id type="github">odamex/odamex</remote-id>
 		<remote-id type="sourceforge">odamex</remote-id>
 	</upstream>
 	<longdescription lang="en">
diff --git a/games-engines/odamex/odamex-10.0.0.ebuild b/games-engines/odamex/odamex-10.3.0.ebuild
index 96a4e1334332..2cb036706235 100644
--- a/games-engines/odamex/odamex-10.0.0.ebuild
+++ b/games-engines/odamex/odamex-10.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.xz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2+ MIT"
 SLOT="0"
@@ -41,16 +41,11 @@ BDEPEND="games-util/deutex"
 S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-miniupnpc.patch
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-jsoncpp.patch
-	"${FILESDIR}"/${PN}-10.0.0-unbundle-fltk.patch
-	"${FILESDIR}"/${PN}-10.0.0-musl.patch
-	"${FILESDIR}"/${PN}-10.0.0-master-std.patch
-	"${FILESDIR}"/${PN}-10.0.0-gcc12.patch
+	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
 )
 
 src_prepare() {
-	rm -r libraries/libminiupnpc || die
+	rm -r libraries/miniupnp || die
 	hprefixify common/d_main.cpp
 
 	use odalaunch && setup-wxwidgets
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index e824a4cd94aa..90c9a62efb99 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index c5c152518afb..fd83262af09d 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,4 +1,4 @@
-AUX mate-control-center-1.26.0-ayatana-detection.patch 13532 BLAKE2B c6202085e52b9858505ec0249d074a546fd4917fbd0b25ed6599ded6c3e688f5eb62dc1b309204fcc6128010efcd1c0cb9e7839aac553496614141c262598af6 SHA512 ae35dd7433318753d514afa6e5bf5081cc61acb3337e6a1572a0fb23e08434353cd146060a8474e4abe92a990e3d189826246e72708129cee060eb3d2a1a55bd
+AUX mate-control-center-1.26.0-ayatana-detection.patch 13594 BLAKE2B 57a8711bebc864a8b315ec2b6c66de36cddddd4302ce2ca07b8a6136c401ece9ac99efe3608656c1ce61730bb65829f10d52ff22f19a1ee32a3f6b15b458faf1 SHA512 0cf3a80780e072c61f3cc5815d4f0a40958972d4f507209c2824b377ae1e6b4b77fa2aac1b894740d2fb836412173156afda917e0afede6cc2c54a4d9019cd44
 DIST mate-control-center-1.26.0.tar.xz 3449952 BLAKE2B 46a3b25952417dc0c7b893caca956e5a6097a2e88f17ebc9f98822efc52ff36fdb4517a8bac54c96550787f1fb15b24b55898ad272d309db17c1ba1530cb488a SHA512 958c41200b6fecc5cfbebbe7112038468bb5e8a6a877e2b16a40af3b41c100e32052e176fc87029eba3d0ccc05767f9400b609ab413924a54222cb18748d746f
 EBUILD mate-control-center-1.26.0-r1.ebuild 1551 BLAKE2B 81d966b3e0fb71f6a63f4b2dd7a1e36aeb9e045768ca56ec534c5d9eaf55f73fe81e04295b41659fe90bd3951d706fdc8bd8613fd4b2666c0e6951de504517ae SHA512 f8c37a2224169b15530b176b734c68b03ec5207db68b60581e1ddc2586f705c856175e7989b3d556d6d850f5f2bffe7871634cb02051bd22f488b5ae9c98b360
 EBUILD mate-control-center-1.26.0-r2.ebuild 1665 BLAKE2B 5620ef2c145944ea3d00612426261c62bd606cff670fed7b9d4b7ed2e199b886bc3c12f4f1d7af2700a6e7b9726553e1f8224e3f7ec2fc766203321460a8575d SHA512 c516193978a3d061073a219783404db27a3aea6d8af46b950756143db154d3e3a683e9cb9d1b4d63811d6d7764c72e74a6f04c309c0999422f3c9197ca4f39d1
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
index c8253b7fbf7f..ed1c8aec619e 100644
--- a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
+++ b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch
@@ -26,9 +26,9 @@
 -        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
 -                         enable_appindicator="yes",
 -                         enable_appindicator="no")
-+if  test "x$enable_appindicator" == "xauto" &&
-+   (test "x$have_appindicator_ayatana" == "xyes" ||
-+    test "x$have_appindicator_ubuntu" == "xyes"); then
++if  test "x$enable_appindicator" = "xauto" &&
++   (test "x$have_appindicator_ayatana" = "xyes" ||
++    test "x$have_appindicator_ubuntu" = "xyes"); then
 +       AC_MSG_NOTICE([Enabling AppIndicator support (as --enable-appindicator=auto was used).])
 +       enable_appindicator="yes"
  fi
@@ -41,15 +41,15 @@
 -        AC_SUBST(APP_INDICATOR_CFLAGS)
 -        AC_SUBST(APP_INDICATOR_LIBS)
 -        AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
-+if test "x$enable_appindicator" == "xyes"; then
-+       if test "x$have_appindicator_ayatana" == "xyes"; then
++if test "x$enable_appindicator" = "xyes"; then
++       if test "x$have_appindicator_ayatana" = "xyes"; then
 +               AC_MSG_NOTICE([Buidling against Ayatana AppIndicator.])
 +               PKG_CHECK_MODULES(AYATANA_APPINDICATOR,
 +                                 [$AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
 +                                 [AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [Have Ayatana AppIndicator])])
 +               AC_SUBST(AYATANA_APPINDICATOR_CFLAGS)
 +               AC_SUBST(AYATANA_APPINDICATOR_LIBS)
-+       elif test "x$have_appindicator_ubuntu" == "xyes"; then
++       elif test "x$have_appindicator_ubuntu" = "xyes"; then
 +               AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.])
 +               PKG_CHECK_MODULES(UBUNTU_APPINDICATOR,
 +                                 [$UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
@@ -61,8 +61,8 @@
 +       fi
  fi
 -AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
-+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes)
-+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes)
++AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes -a x"$enable_appindicator" = xyes)
++AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes -a x"$enable_appindicator" = xyes)
  
  dnl keyboard-properties-capplet
  savecppflags=$CPPFLAGS
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index b653befd4693..54fbddf05af5 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/iosevka/Manifest b/media-fonts/iosevka/Manifest
index 81351ce67b3e..92d3e43216c5 100644
--- a/media-fonts/iosevka/Manifest
+++ b/media-fonts/iosevka/Manifest
@@ -2,54 +2,79 @@ DIST super-ttc-iosevka-15.0.1.zip 64196804 BLAKE2B c6acd248247c31e3506b2286c5c62
 DIST super-ttc-iosevka-19.0.1.zip 65922092 BLAKE2B d6b40ff8fa8ec8b83043c1aba5bdd06a3e5a20a45a9ec6fe7f2493ee300a16742b628db3e0340166dee9843d4ceec7b7169583cc00da735634d37c89dd34d8db SHA512 51e3c2d533cf2098a0c20021a0d0a39c2dc765bccd749c76e367dcc84a8fd5e508eec919442f5f9e4dcfa4215efeef9421c0d3149187c30e9a4a120c2cf1600c
 DIST super-ttc-iosevka-22.1.0.zip 68453859 BLAKE2B 548799658dce32dcc9d412bd80934aea663152add8c9ab3faa4079ed1e17b7a57e0aa799d2af3d223211cab4e123d1e0b83cdc27dad0002f52d880a8e982b748 SHA512 e8f6e30bbc1cfada68496a7cf8326bc8826483944140aeb44c46ada38cf7003ddba9b4b5de5386b6d6b4bd3e77416a82b6625a7fde7924ddba791184f2b2f733
 DIST super-ttc-iosevka-22.1.1.zip 72536156 BLAKE2B 539e324902e0880f04dde7081bfb205e037b90746236f2f3a6478f43a92333347d580fb488f362ba0fd9be58e537cdfd623a547b54f5464c02bac3d779a0e190 SHA512 e67998e7abfbc3a5048783a809becae80946a754953825df1343b9e49d852a5438a43fbb8a43ddb65f9ed6bf14ce7cf36681f997d6d28755baf42e2dfdea3e1b
+DIST super-ttc-iosevka-22.1.2.zip 66558531 BLAKE2B 0f4369dd283bd26fc826a7b15b163d7ad0e0bf8591d483f3ebf2a571d6854281f5ce4c2a1415a661b9f7d48d9a25b4bc875671d54683a668848870184b980c0e SHA512 d1a11b6b55e16e64f2dd3f7a113465c5b4fc945f0dbebb486587c9fa0600ac013a32c001f097af78e95a8a977419eb4022b0503dc54079a2185e5c90b1ded925
 DIST super-ttc-iosevka-aile-22.1.0.zip 41841779 BLAKE2B 5934485ca16dd4f94a0e21b19d2a24f8331528ad260c46ac9f8f883b0c934acb7d97ec37f9dde732e6d0b620849eac7a090aeb41031ad5889ff3876f20afa0ae SHA512 17d4b0e2423f4e7277eaf8abb6ec06280b6c810b985b2fb6815e895f92c89712b36f97705f5afb7cb2ce2888c3fda6752f2f21e485e781ee55d08cc471748d73
 DIST super-ttc-iosevka-aile-22.1.1.zip 43402320 BLAKE2B 86feef2a5609c0d8861d6d558a648b337d10506476cdbde02c8787aa70609917aec6d8fc015a1f7b41ad6d16820ffbd49580dcdb5fe397fd016e37d18b4b12b1 SHA512 dc6082e2c538eaaeea09144c8bfe67d334faa9f4586387ac0d33e2ae5f4c93a439ee18017c0e6112b7111d35e3ccb5da6af715867f4ce386e18b7a774fae15e4
+DIST super-ttc-iosevka-aile-22.1.2.zip 41540326 BLAKE2B fbaa3c04530fd936693844e0790dfe9d2e091d2e740abac4b5105afe1f54911161633c97cd549056b360c14fcd90f66746260ba87d86681603cc2650ac109aa8 SHA512 ff20798fc768c175bcf57ab35354ffe66ee4fb9a605803392b518df340f13b6e2ba4704861b2e23fd77870db910179231ed7187f56f051e03736eaf4065f880f
 DIST super-ttc-iosevka-curly-22.1.0.zip 68495028 BLAKE2B 3bdc1039bd739d51bf152a02e257c1b867097bc9192acdea3f489cdb5ec6b4ee8c89c618b8ef565e9d46e581fc1355ee22e7a5ed392ae6f969632c8bed9d844e SHA512 915b20dbe2e881a4d1450a871cdef003da21196b04f28efec3435a1d5a3a27a1f5c4ca138152eeccfb26eba56a465aefff2330a97ff44b7e2a80e8d733007e1f
 DIST super-ttc-iosevka-curly-22.1.1.zip 72151290 BLAKE2B 8701b533d75d9632378f56b1c3d560d4a50366586451a8366416ad8520f8868d27097a75780c604d57d9a868c3d106a10cfd7116932dc073f382ad3b5cf74ff7 SHA512 d39372d670e23288a0a95c1d3ae1939c911f5a301f506b5687a59db9361abfcad64d21f44a3429c73bb8e803d40f9da92c454d80dd8c64b14b653986418cbe08
+DIST super-ttc-iosevka-curly-22.1.2.zip 66595562 BLAKE2B dbcbe9f0e658798aad72f974a7036676c60e146d98e886d58e1fcb7cc16c67c247270d5f8e7df925157a708b44d3d0f93ee6ce053fe313515cf03455f52f13e5 SHA512 e0b47246d14244cf2de80b1314b66fd6f63fa7f42495820b1fdfb377076910ff5783a2854542485669d154c61d34feb7fbd09d18264491f78f3ecdf5f8e5301b
 DIST super-ttc-iosevka-curly-slab-22.1.0.zip 73198233 BLAKE2B c5afe69db5c8c379a94353c7299cfa4836e87337a87170ff0fa6cc249eb5aefd830984b8238a17b537cb7032098f963aed9abbded1c4cd9deecdc4d89a3682ae SHA512 c1cca76e79cafcbdcc14328c743321f6324aaf86c729232b8f1676c1ec3f5e709b1cdacfce3b0501e89f355202a2d1ad8d9db5c8c2d0e9882da89899b3c5d6c1
 DIST super-ttc-iosevka-curly-slab-22.1.1.zip 75978484 BLAKE2B 48d85b44421b00653f5e0dbe6150ac967f75cf316e151ccd04143152cd0e8e54203a164f198896c52b3c6bdd3aee8848b6e43ce5c7c797b3794949298c678607 SHA512 82030a89580917c681b476a792a1a0c2c311189327be5c8fcd5f528e43c03264ff5a3bbc9ca2c665b3e6ad3cb6fee2508c75ef52bcc9f38523e04b2e323fcf7a
+DIST super-ttc-iosevka-curly-slab-22.1.2.zip 71026639 BLAKE2B 01c0f1421b501ea786e59642cb8625937cc4a6297a6205931cd0f8a914be2f6f8990afd78fb105e518b15b9f562e266aaa823032ff66100545b7cafd1735dec5 SHA512 d8df333e283efbfde554eed2011cb2f9f667c26ea89aba0c806d0bfa1a11285bfc6416e33b177d00494e604e5b54f096cd3b8c5268826726f11c90fcc94954c3
 DIST super-ttc-iosevka-etoile-22.1.0.zip 45315945 BLAKE2B d689612c44ca1412f4d7a9e370984315f6fbd74add2e6ccc014fd9ed1373a5fb30630efeb68a6d701192303b21d4236299a6aa98b899c8a8997c076df3aaf717 SHA512 b0c861c696a37bba2b89c56efd7efb75fa47737dd2ec907d36114723aafb347f435cfe0c9be301d7408da8490163e92e62daf95e9053a6656c8edf87761b216f
 DIST super-ttc-iosevka-etoile-22.1.1.zip 46409053 BLAKE2B 6a6a918e72db77735b81758652382e4081d3f835b20184cb828f6bdf085a387a54e1cfc6218a6676e551717e0d2667e1f8ca7c47c9adce9c557226b8dfd4403e SHA512 ae7f59bce73afb45062f38752abc4bef2cafcb3ed14c80ca07e45e2933e347c5148424a030ac828c7b432431f2e0e0094e586ffd2c83bad8ae2e4cf685fbc92f
+DIST super-ttc-iosevka-etoile-22.1.2.zip 45286747 BLAKE2B 10af844120f5fd6e0b967606ebd14b91956779aef6c6c1b67d67af1686867bf783f1f88dad57ffacb358f346cd05740e2f3aaa3d7fcbb8f8ab6a19d39f6f6753 SHA512 30cc310393ff7a9dc924f715a218137624885a53f5453adac2b199ba0fab59d7f7907b0405c5cdb0745149e1158cade21d8a58436158405dd6acb2f4d0465b3d
 DIST super-ttc-iosevka-slab-22.1.0.zip 73304024 BLAKE2B a1a2f6d92a335f99a621a9a990e59303b298550ec34ac1c53b16af17b285c98b3d1f8b6d29e870834808ef60ab1761820691b38680a2eb31b42844c3cce45100 SHA512 c642b9573e8f95a76b19fb421b604c4b813d85f11f8a2bc3b502bc78a44acde751b4114c95c6de5bd23f38cf49f5760170da59d49ff7b69a08ffa5629ca957a0
 DIST super-ttc-iosevka-slab-22.1.1.zip 76076017 BLAKE2B d4b4ef828b9dcb05edbcaebbb1b3f3a36bf3be2b31c6ef4cc204b6db361afa68e72b971db8e71689f69ebe86c34ea323a87ed284abbdaa99e11738502ce743bf SHA512 2b5642199f72013636b33ab24c2e074cb26427835cb817218401ce4daa444ae0e809e9c3be3623cdd05b16e3fc36ea789b42a8909168a0b10c72698051cd27ac
+DIST super-ttc-iosevka-slab-22.1.2.zip 71250496 BLAKE2B d702e86ae489839506dabd8f28781048dd2e24fa74db36c99c1fe2e9650bf6a27cbb04c8f063f3bce66f8d136c7dccc488774d272a935ba4a3c65f1abba78cd1 SHA512 3bc115f4169cc74a6ce0410bb1fc2ce3cd1920befba3fb4a74f96e8b22ce04238da4aa1dc0d37870e2703e53553cc018e80cd91a67fac81ff1750e580d2a0710
 DIST super-ttc-iosevka-ss01-22.1.0.zip 19357521 BLAKE2B a71f909a61bd80480feb1b48281709616b6948ce2fc77af4335b7f835f888305cd12db66d227be8b5f743b5dd5f1477cb3895947145f3094adf667ffa03ac39c SHA512 17f3e4eb7caba267d95cf45926612c62179a59c826674ec22bda80b96237a07ea5fc1bae9e4a8b1bcd10a6efb1395006452d6381d283305be91eb9ade0e4611d
 DIST super-ttc-iosevka-ss01-22.1.1.zip 19829342 BLAKE2B bda0491d0fc395ba4781630e423cec3df42bcf91fb5710bf66eaccd7d90bc46b0e269c56a3248ecef3f3b156d4a28734482cb2ac2cd5221715dee25ecc52d7b5 SHA512 02669efa68f46cf448f134829c5862b6d80f4a684ed1f7a7179cfd0bd20ef7053078c682f59840d9cc6171e2f5ecc6081becf51f96fbe7edfb0c2f71a7f5b8dc
+DIST super-ttc-iosevka-ss01-22.1.2.zip 19955084 BLAKE2B 1b4075cc5a49ae76abee1ad4427693d469a3d1497d397d168477dce52528eb5e37c1b4e2afaa18dfc9207c96c4719cc69d79b255304154de83dbe38858538bfb SHA512 acd599c26385ec1f42141ed89315cc8c44021b4574df068bf494a48f0b773b92790a9eb32300a89451661c7e594b7293dcae2ffda5aa1b1d388f48419fb30c3b
 DIST super-ttc-iosevka-ss02-22.1.0.zip 19566557 BLAKE2B 3546e8717927746b27f4332f88ee22f25dae3b4958a4c70f22d1aecdd68a5eb4be5b24fe02c0aa8deef36ec1005e26adeb6ac1c3223ef9e5f1f37d5f20c64138 SHA512 3a3905364ff1780f3d3cf3d58fcb0dcfd0ad950270b4e162c7270638a2f1eb9a0c67a55623c657c10bd5518bcc27d53d351dee61639755063fad17afc7fcefc5
 DIST super-ttc-iosevka-ss02-22.1.1.zip 20231804 BLAKE2B 9b6dbe7ee0ddc71537bb043037ffce8dfc43f7f9e915540987c9901f5b065c2a1823e97e40535ff470d8d60344e88a449df41597da789c3d2b457b92139ed08f SHA512 27afab8963d641f1ef693b6eb7b30a0a75727f584de9ac41f6a4b688d82563a54150b97e6f26b06340231f2d6ffd4ec71225463c6ba1ec69cf7d649fbd53e2d8
+DIST super-ttc-iosevka-ss02-22.1.2.zip 20159161 BLAKE2B c6a0e43ce569422b55286999c3a3c110fb7cc63f005618ff99c91a659d8a9a0ef8b6de10566001f958004d77000124c2e2d0f6af0ba9c7dc80a866b20a740b29 SHA512 f89fe73159fda0c3c4dfe4bd37b34ad0026b5e75498c4583beb369dca9d2ce5eeb8b2227272d44a03e6aaa20ef5c111c530fafa411c0c741237980abc21df4ca
 DIST super-ttc-iosevka-ss03-22.1.0.zip 19737226 BLAKE2B 26bbf858d0245f9bb5dfc28eb765a70119698bcf86421288c24b0330e721e9afe0986c7f87f44a01a8e65ea6b982bbf13c894e8509330612f18d27f516baa6db SHA512 42370cd41fad5427679a72da39f8e7b2bbcb8452a981bf8283e0e10bf60050d61aad70003039b046f176b70581d94e048c68d3675219dd2a03ea21273b8ba0e5
 DIST super-ttc-iosevka-ss03-22.1.1.zip 20328649 BLAKE2B 503fe54c94818f4b3e34841ab9bd59c3b44db70eb7c65c6ab924d8708c30706f03fa750f6089f4b76f7452d31492aced2d7386145aeba5ab33aa7b23d7f73812 SHA512 3c27323f8c2b5e87d8a9372111fb35242bb70b13a184daa5f1b7ee8e771fa568b5a59134b7a8165dd5fa1bc573d4d78f30361749a28c0020516723f50c41736f
+DIST super-ttc-iosevka-ss03-22.1.2.zip 20351484 BLAKE2B 87c8c4a4aa11a746a8217ee68deb7c527a0f155bc80369f48133f0fb5947f4218ebaa3943bdb5907f355b056d7ded62627ae32af49cfe061fdf27779a1aa995f SHA512 58d54bce7fa291beb4a9cb92be4a9be1704b2e76799a57d4becb1630c9ed92c80f5bc131cae6f413d694e2250517fac09a0cd009460c2bae7b9e1c9ca922b09e
 DIST super-ttc-iosevka-ss04-22.1.0.zip 18997524 BLAKE2B d846ff9afdb6d19498a89cd819a5286614525c1a03f2a359dc9976a64045f5bf44c90f0488750cd21ea11462b1a05db69d91ab7160538e702f7ebd8ec9db1caf SHA512 f6c0f8f6bfa7eca9be3128f6f019ca98dbcdf3e52bea3b6b6ad98105796122c3b78ed86bb92ba580d66292701206f82df789c6b749c10ebf29c4553631bdb44f
 DIST super-ttc-iosevka-ss04-22.1.1.zip 19554181 BLAKE2B 479ee9053abdbb43953e29b8f911b65a451b2969e1a910c9653fb949ebc0d7403f890fb7c6bf8bba053ba49c710a9850bdb25d892ce3e504da9927f7f52396f7 SHA512 a36714f4c6f43ee2a665c9a4dee0972116e9a532a1161e40d66a9aaf482ec7c112a449dbdc394ff928b66bff2113a5ec773fc4e94728efe4491eed38d987293e
+DIST super-ttc-iosevka-ss04-22.1.2.zip 19581465 BLAKE2B d0504c8ce0e337ebd24fcf70c469917dfaf5da7f076396497a0981a5b8221c31c6d318079b5c622167be58cbca71bc05ff661a0d9d8264a9c99fda97dd2c5cad SHA512 8464aeb4488571f209c018e320ebdd08d1c5d2e1f96a1415987c529669348207e318f949f7bdde551a14ee1a408135af977b865274dfb7df0ee7f3a06c7263b0
 DIST super-ttc-iosevka-ss05-22.1.0.zip 19733416 BLAKE2B 8bf56d4620c766716a290343095c1eac5ce82f8581c102c4801a2acad6eb38b869066ebe7dea43b18df3ee96e390eb52439eae50f8ac59e3e9c49d84563044cb SHA512 14ce6a2d762bf76ef187a101068810798bb7e6f2f317c43c04acc4ce8079a58194cdd35ad3fedb4030bc57e69d7dbe1791b016bc38b53a0f7c73da795884d158
 DIST super-ttc-iosevka-ss05-22.1.1.zip 20327464 BLAKE2B 0a5a38872438ecec3585c8faafd2bdb9ee59621d23c41e5124cd3d8ad7a3e9bfdabe9d61e52e50444b9ec38e7b3ec909de50d12ca0ccf8a0dd7827809cb4550b SHA512 ac07ed20f7fa1b5cd8b436443bbc69b039c555189f2379b37f8e63a917582f4d5287e676f3621d2e7e38c4881af2f9616deec92526c56cf90775f663ece2c1e9
+DIST super-ttc-iosevka-ss05-22.1.2.zip 20341731 BLAKE2B 7c152f9f8c879ac4249a8890034d55b211f6d58f1b4020f2baaf548fad241af4964d72b3b428c4ea32ec7430f653842dd0d9df148dd2a70017f66362f67edbed SHA512 4f2a64e07b956ff838931d1d5de5bc11608cc87104227d019f119447193a61515c200992738b8ff0257b91c300e0ac9c4568ab33ab02b69a38a763dee5cace70
 DIST super-ttc-iosevka-ss06-22.1.0.zip 19320291 BLAKE2B dc06763336072acbc386a30b0bd3f7c1b060ea1d0a9b5ad8c8b52bf6601112f239ba17ca838c73eaf433c14864406f6aa883db979a441d68e0c22f773d4374c4 SHA512 26263341c1916ef99c5230cdf9648e72d860ca8ec453d494d6e26cef4569f2e153dde02a746de1e5262ed44374f4005f5c9a7fda30d23c240a685d451725de19
 DIST super-ttc-iosevka-ss06-22.1.1.zip 19839814 BLAKE2B f4de556fbfbbe4fd3b8dd19b421ccc8df7d7c77da110fb45ac4ac7accf5568b80582cf5e1691d6be4f1c4094c1d268eefb82ffc2f5022ac78e69a7e8da252b2f SHA512 cb6eb2959780049ec5015e13f991f086a5b2cda24d3f8a19a965e2d4a6c40e5de085d763f18b158a14da208a414e5f674801e4e07ad491a8d8ad24921ff6094c
+DIST super-ttc-iosevka-ss06-22.1.2.zip 19865593 BLAKE2B ac663a3d5751d0176e36b8c7694bd8d8040c8686f696b735ae90487ce7df798400a948c94fad8f5f74ebd9084445ec2d1922c025ffe26049bb8861283b7cf69d SHA512 22cb9cf1bb7c0b1d7ba96424b77c1c592f45ff1b27b588ce6e560519211608ac758a92270d0042b87cd0bf1b1883ba652db97be2ea205f956f25579e9d3c515a
 DIST super-ttc-iosevka-ss07-22.1.0.zip 19330247 BLAKE2B ca8de523c141f8911ad2230e2699dd0cca6e0fdee18c4430cc2b2e2599ec655900723f7b09e0b2e3c39022c7ddd9730bb46f2b4f1425d7eb22c9652b9e668fae SHA512 bb26a1644f53a5dd1377af2af910e5775290eafb23b438679b1086af2517d9eb102c9429b9af9940827fae79e11ed4d580fbd0b13ca654ea5a8c42093b1448ff
 DIST super-ttc-iosevka-ss07-22.1.1.zip 19924011 BLAKE2B af38aee25ccfea72da8f7d77463dde691dfee40548d906bd9802bebb8bc7fbb8de5f05bec8cd45c740fd7f55f3e6908621c42842970a8b0a64513cb03a6dd1a8 SHA512 fadf6947c5925db9cfd692f44d948f9a901a3663c12573ea023aadde41a55b63f80adc255337fe138835f69446ac18a7803ee746df07cd949a5abe758dde6505
+DIST super-ttc-iosevka-ss07-22.1.2.zip 19943497 BLAKE2B 7906f404509b95eeee1357882566d9875553120ccd5d4432e9dc85c30175ed1e6b24a4a48518852c9b4d1e7e99ee9db416a1f1436edc3b82a72818776eaadf38 SHA512 c728e9c9607786972d60fddaa00f0fb9ab24fa73c5a68cb781125adaa55bab3519b5d68bb1ec9b2b0ef9e9c024cb24a55ac776bf3cf3da12b9985297997b199d
 DIST super-ttc-iosevka-ss08-22.1.0.zip 19897915 BLAKE2B 05942b65b8d647131b1c835efb58daf787bb364b881dc49f72f662c3877d225864c966cf5e613d8db69b54846264e13caaeed0b99604cc78985e2d6cc00d897b SHA512 b5ab468eacd6b6553a3c8b8181ecd846d58d5705449f306dee3693c229052c66c0b09e3a56924dafe639bdeb94e869c27793ad8b9415962b8d6828e413c30e27
 DIST super-ttc-iosevka-ss08-22.1.1.zip 20582805 BLAKE2B 7d48e3eb90d4eba555ec7337936363a3a931898d4443cb0045fe5c4cdcfa287e518329b9c137ef8db96e9e220fe44c021cc65fd5304623c99b567376a0706977 SHA512 6d415af97b2f06795a49230d8c974b212a575583c20a8e9a3fc3281245fb029aecc529c0007101f733d9124ebfd44ff60aa92404d00c171afe602eae2e1fb0cc
+DIST super-ttc-iosevka-ss08-22.1.2.zip 20501993 BLAKE2B efd30f8b6934ac3a6116f17f024ac240a7c847af482d5f55cd08b330e1725cec926744919d41b7292f3736a63e720ccacaa57ccc7ca98d48ad42823320a2290b SHA512 25ff396372f39e051864e34ec48fc23b58a722b244f1983085a1855a14dc92eb641d0f9ba3f65d9e02da9c6ba5b488d22cee14ae007af43c907a76aaf19376dd
 DIST super-ttc-iosevka-ss09-22.1.0.zip 19815079 BLAKE2B c8183e6df20d7e78fcc0f7fb6517c56e6daae89eecafcd5bef81561db421171b4ada5f9b96d0fe281683208f454509be3772838710686edab7ff861280310030 SHA512 40897e22fd79f76bf6a4a20274a9062b0f603609c8813192ff5e4c5a781c40851253ced6c3cb012aa97508b42bb8b3e1a3b39d66bccc464b02afa144b20d13e1
 DIST super-ttc-iosevka-ss09-22.1.1.zip 20415086 BLAKE2B fa4ce5f2e037f03f243181d33cb5c629914370c860ccf79633b53f05a6ed8cc459ec3a3c051773bb6cb43b23c69b338f73640f2a78b0e2489567059d57174968 SHA512 e2755104326de64f4b6c5e144419bd83eeaf5e1a4677dd395bbed89ddafba93873b720092c3d44b84d5f251a2564d6a3a178bf4206437e04cd31c6b4ba54903e
+DIST super-ttc-iosevka-ss09-22.1.2.zip 20432729 BLAKE2B e38bed1840ae0079a5e1c06400b9019409cf25b2cc171ba1e03e81ec5897e526eee2f100a0fd2a00613c70c01bcb6296ce6dbc986591b314aa916c13c0e0f424 SHA512 cdac65673d4e9857d7f03065eac9e8665e1ce5a19f7445c1ddf791391196a204a71e67c89bd5681b6fd3a0449bff6bbdbbb500d65c7943f6d4d688794ae68751
 DIST super-ttc-iosevka-ss10-22.1.0.zip 19609406 BLAKE2B 06828cc7f69315f88644ba99ce5430c20c146edab998b2828e47611d18318fa2685ccf7b83caefd8b63ee6d6c9a3a1770eb750aa7de8039b633884274e281d20 SHA512 a57081aa098a57b2dfddea58466e4e70a93cd3d18db3accc911e2ab70437509f0a1422b63aef8100f8ef282df443308a1580da21eceadf3c146aae58c2d0e7b4
 DIST super-ttc-iosevka-ss10-22.1.1.zip 20295395 BLAKE2B bb02dea1e44fd09fee9e2a153a3741d4691e7516babee0ac274da8a0ba7dcccb785b6864c756bafae315e7495491b868ab57c5a5ad4a9996ad1271f05d3ba26c SHA512 7904bf5005442efba13a8b43f1334efb49cfef40a12c78f38de8d27d64380f497bb29c61a8fe11f5e7f09979d03781262fc4c2b96ba582db35cd94340bc1eb4d
+DIST super-ttc-iosevka-ss10-22.1.2.zip 20209310 BLAKE2B b3d15789d047b3432b4394d003b2414847caa86796825aeaacd6615e39a6312d650da217f9ecb0ec879100488bba797e07ae7205f5b4df57aac504fb7d997fac SHA512 0d36d27cbcadb657489f50c340e19044bdd8f5d3b6f8333799c75c83fd7f965785f14298f2a29146a89ec2ede0eb5468dca50cc655f4406e0202e3723d66b889
 DIST super-ttc-iosevka-ss11-22.1.0.zip 19724947 BLAKE2B d0e383804f73e115e7ee8b94234764d4c018d586b4677763978b64c79d66a201d150106bc09355213dec26d7ca4fb558d1ecf4b86e7914355aa3168e8b2e0fa6 SHA512 86f7bf36bf72e7b12abccb06259a20920751457c68eca343e343d46652a3adb712721783083714fe3fef0111d2e6af954a04e4a55327b5123f0c853b42a47e1d
 DIST super-ttc-iosevka-ss11-22.1.1.zip 20439887 BLAKE2B cd61b0e91a9bdd8eb84447729fbcdbd12f41f87430a414ce3701dbb7920febd3d6f0f9e2de7a4efdf5c139106fa5260ad783f606dc2df5e30a21026dbcf3e8e0 SHA512 51279562badf4d22dfbfdc14f03423ddd023aba554a39321db33e83630ea6c6f6b42ea57783f6b47996a55c03523ac9ff4c5a2c97107f9e5902b8562eb5b306e
+DIST super-ttc-iosevka-ss11-22.1.2.zip 20343807 BLAKE2B d57a092ca10413dd19bd9c1122ad6239acb5a8ce41726861ef1968f8834089ffb3f4ac4930a72c273dbf8e7b92b4e15b53fa0be30df09dedcd77fcb2bd212fcc SHA512 d76919ef3b2e4a4a98f12e486914e74ff787c9daeb492384109463b1b7e715ad565056548c7c49fa4f4bab0be7f6cffe958d889a0fcd5ce87ff61324bfabc2fb
 DIST super-ttc-iosevka-ss12-22.1.0.zip 19829299 BLAKE2B 8721662577c44e6a55d721647a1520c987328422fe89fcd826f74643e7a5ba435891f2afbbffa5cfa5541f41c676565e60fbdb03a8e5437742682178c8c0fccb SHA512 adfd2cfd8defc9d924e7e8ea9493d3801ff5450c91ddd8e19a8a84f7c62994f15ce6831f96b3ea13f87cf95a528d2068e58b691f06002e3318d538df7ce525dc
 DIST super-ttc-iosevka-ss12-22.1.1.zip 20422247 BLAKE2B a33fb43495cfab3035385af4da1a56aee7909b6a52abe354c4cfe7465ede69d016236c3d353083b8ae136eaef0ccfe9e9a2f5b0642fa0af562181888dc64b826 SHA512 e35ecc1986c7875ea152fb821d7b7ac0d77619c6be13746f7134211388ccdc7a04231875c54c80dc03009b20eab824a6f8bdacefde994986e4f68b9de085b827
+DIST super-ttc-iosevka-ss12-22.1.2.zip 20460365 BLAKE2B 23b38e4f83b893930826535ea1a70ff136e5615336bf8f91b5ce8d05c7b38b743358d469405309661e8ea16b4017e1bf061cb43b6534de3a5ccdf6041bc086ad SHA512 8debbba250f2e76e915fbd0dc8b5b41d61557373bab9fe15ba22c67688641239faabff4568162056b88d6e2f057067ff22f2c5f4b6920d9d8567cd394b4f3986
 DIST super-ttc-iosevka-ss13-22.1.0.zip 19254479 BLAKE2B 6a26288c4b3d4e1dade39f1742692bf7c99c10916883772f3d0a0393fe9dca3428b01b442df496dd9e5ac54ac6a4e0078608b5e56b8611d79880ff3fefb5b243 SHA512 3d8de6ac4583e75916ebb9290c98ee71877f4c85682368b4d896d45e0f24baebb2e99a3ae9466880c0041a84c854a4aed742f5741a6cd2c155901e1d84062041
 DIST super-ttc-iosevka-ss13-22.1.1.zip 19841886 BLAKE2B 906c1e960592f3fe655a77d7eb52133bc86c8a4c23209fa5cb9364790cc2c15f405528e8ce8384ea4a0eb08a09ebfcbce8b6ded9547ed8d434c0c71334e0bf25 SHA512 8c99c4047f50b116ce45661c0cf31c1b0c13aa74456b40e0add20ff7dce6f8eff9285fdea0e53602ad34544cd06a4aab53f8e98a4a6917035644539b542d1ee3
+DIST super-ttc-iosevka-ss13-22.1.2.zip 19851441 BLAKE2B e452d79b751ce5610dbceca33046f87a5d3a54dd94a5998bbef33b58155b7bef746864a9f74d7b9c2a4852dfe71ade3a19154a906a7471b9e9d8af98b257ebcc SHA512 c532a88b8d730a08324d08705683b561c70cbfe88e606ec35125c1afc0d695c822feec2ca1f038c8219d84f39bdabaa27b1e2421c8bb0f74ee40e44fecc1de3c
 DIST super-ttc-iosevka-ss14-22.1.0.zip 19062815 BLAKE2B 1f893835a9af73adebd06511b026d30be88023d6d6c3c2b2d94d888771be7f9b14954fe64dc33f1b9ffec9c203a57bad96d17e78fe29244cafd32b18f73b47fd SHA512 99d9eb358225ae33b6bed8db56bc042742b62109e59bab39d4a35012aef3c11d42e36ed31ea8f76e9f3d28cf642f1c1a361938786db646c39db733de30b0b6db
 DIST super-ttc-iosevka-ss14-22.1.1.zip 19738160 BLAKE2B 04683f2b959fbb691a04b395f3ed2c9de945d5ddcdbc18c95e367bf2e5839c6dc3c619797370c965055204a96fcad3d9a1e4d572269702163069989cb1995a2a SHA512 9f018c3ff028e5fb881668f859b1e349e7fc85d40d746b8ce1330c54fd1934ebe9e8c86af4e52eb4e287730ffe9474527175534a7f7427b00cae204e5e1b3f38
+DIST super-ttc-iosevka-ss14-22.1.2.zip 19663283 BLAKE2B df75f3d2d1a2c26d08950a87b1eb3e9ba43231fd3641ddb6f0d0f72524924f58781176bc950d25c62d7d11167c85f6e1d1901d4693244729761e2a576e69d70e SHA512 399f52cffd55b1da58d01783a4cba15530389c67f8bd94a18ba1ef47eeec6928af4dc3eaa64e9f157a677f94efcfde34497b75f89b26646d98fea54d1a1e1fa7
 DIST super-ttc-iosevka-ss15-22.1.0.zip 20371207 BLAKE2B 2335c2ae0f63f2155469da6b105b039660c18053b5e0ca25cc1cf97144ed16402d8d3c07274602c4fa64a6c12beed014e61af0d440ca8e173efe0b88081ad216 SHA512 f6cf9ea1b99baae7b83eeb1366e175f951189b26d247602515fa2113f542a4ec399679ddaa262ba8437bb03043aa7c1076af74f57e5552a64f5d112e5e7e93f5
 DIST super-ttc-iosevka-ss15-22.1.1.zip 21080992 BLAKE2B 58b1babcc0a6eedadf7bf1d51574fca4cec8d6e3fa28ad93634ba79af8d6ee2b48e1d2cfcb2041df6412c49ceb7455888104a59d57e6cf84fd9379af4e7689f4 SHA512 933e433bc7a1638038cd18a48c413eaa7a084aa6605b8caa783f8f7d51ea9536d38c4b0b60d75d01b15c43500d2198622c40ec84c2ebf03682189682578e65e5
+DIST super-ttc-iosevka-ss15-22.1.2.zip 20997438 BLAKE2B 53a0853ad77ecb38208297094dc4cdd3c9842fb4cbfd9db210253659af789440adfdbf33b38fca7bbf0b10bc8d08160441fde85c3936c7839ea0fa179c96ef10 SHA512 69645c8bad725aa4e78bce77741ac1804e4437814ef86a264796fae6bf13726f041aa19cff7f310c8040024743c2dff7f3206d1366b5d52f2f0cc4ffce8f9374
 DIST super-ttc-iosevka-ss16-22.1.0.zip 19446207 BLAKE2B 5525b63b1c845f33460107893e7050f705f1bda592dd6dfeff072457414ce0f5078aed4d6c739ad6044ef3b6db27f9bc2922e35b110b1bdb10cd319d39ae89d7 SHA512 388f65dc83aeb400be9abf3d5c3ed4da146c1146682888e64864d505f15e88ef8078b255779df2d4fa64c4b4793be52572d55eba8f91732ff1df92915f8c2d7d
 DIST super-ttc-iosevka-ss16-22.1.1.zip 20040036 BLAKE2B b1ca557525a6664a52e7251fd135f8fcecbf66be8729bceeacd5c80cbc2b098ce7f5d2e52ee0bc1d568cb11d3bca0110df7fcaf53412925c6084ccec7493b148 SHA512 de8149353c2092bbdc150d648e9e1090364416cda915c866030ee181b8fd79e987ed5a022392915053a35a81966b134052bacace5f52e40ecb7e78b47189489a
+DIST super-ttc-iosevka-ss16-22.1.2.zip 20058842 BLAKE2B 3449eeb145beadf588ae5079d9935bad487a96a4513097a2565351a18c9785518f3df501eb581d7a67c4430a1cb0ace8aa7846f386ca6afe016a7b96202fc73c SHA512 f665d0e765c5d683ac942426007ac584520f3f8666136dec9e5742112e5fb12d601f2f2e43e3bac2c3ef5c7612cd245aefb4f8da5a8d0cc05d605201d805b63c
 DIST super-ttc-iosevka-ss17-22.1.0.zip 20609224 BLAKE2B 9b7ff87f1c9aaab994183fe0db0248e558860c3ede0a8492ea0131cb16376122a7c2c560a4a8c6df6ff7a935047c87ab9bf79e4366933fa1348ca2fe3ed3b6b9 SHA512 7bab005d76dc5e2564d29383073c043a544e4afbfc1e478bd89a5cb6223a232a546ebbcec8bfab64328713633639a6343d06096e7e871c83cbb9ddadee941055
 DIST super-ttc-iosevka-ss17-22.1.1.zip 21348665 BLAKE2B 732e5499ee4e5cf0b3a13a690efaee51eb89d3173edb3c854caf1406ef8ee7318575db014d3fd9c025231c0ea05b540c367dcbdbcf1f4fdce05de49ebd806385 SHA512 dba2bc66ae787e48faeff8ee166c3201d2a9337860bca1ffe7409ae20b0c59ee6007f68c21d6b1bfa913b0996faa7d99933a22e4eee0d5540217a89257704612
+DIST super-ttc-iosevka-ss17-22.1.2.zip 21241986 BLAKE2B 11d9c1aaa08699c7c137767ef560149fb84a8a6de9339ba1b0878b4599822d04d0117fb9731bf4e7f871043d11b6e122509963f5c9b0f9e629a546e9eaa5b1e9 SHA512 258e43f8b578661b405f9c726fc449d4c8726c060b0200ea007fb13f54eb669984e2de973774b83af6c173d010a234c5fb2db6f0b916cc6c8cdbbe673855dd05
 DIST super-ttc-iosevka-ss18-22.1.0.zip 19504535 BLAKE2B f647398c60f16c306e903c975e7c761781501e36ba36e55d33a5e2a3dbffe9bf3e0a70fa54f9f25ec2aee3cf4536dec8f8acfc531bb5c102e4cd6d33a1016e65 SHA512 4148cb1de0c111282ff0903657dba79b68ca276173d5857f036113dc60803dc0a4968021252ad9511f2382fdad9a8b6d56f6c420da5a399dbfe1d7662fb1de5d
 DIST super-ttc-iosevka-ss18-22.1.1.zip 20188189 BLAKE2B d3bdb9022a6021ea3231e1a36579d2361654dc03bc311e31f18d7d78f2d20a9a75495df07041daaec7396442d1e6c4569c172ec538a04a8d448f733970b9a0d9 SHA512 d69db60ca5d9b1fe3ac3bf780edc892303847179fd1421ffd2186149e1f9c157ee99027172d3af4a9bbae564c5287c1782079b17073cf9e6ae3bb28a2ed52107
+DIST super-ttc-iosevka-ss18-22.1.2.zip 20124450 BLAKE2B 0b0d2220679711b1284ea8c8d67c754c02e74df5ac57787865efa57057fb5db64d92e01fa8d7b0bf9290eef2228a38e957e451be47320f4a125978008296d54a SHA512 037a89d9d2c4e3dde037ea8c9ef3622e8dbbf7d276872c5b50b0ec46e1590519442196714c50a0813e2c35521a9562f8bead17a4fdc2ae4e620bcf3ce1ae90fd
 EBUILD iosevka-15.0.1.ebuild 473 BLAKE2B 217816ad45d0e6fbbffd9828372b7fb00d13bc6c530b5db501d95c09e9f6a31fc011e10e34b99928f77140bc813a535293611a812e02fe828687065d7598a88f SHA512 269007683b4ec8b3ce146c8f37dbc8592d7c78be55dba385d70188f9f1bf3f93f8993867aefd076fb8416cfa6b7ceb04b1e934f049157caea84b1b22810f984c
 EBUILD iosevka-19.0.1.ebuild 465 BLAKE2B 7531acd507240a405eae7cbfbb7979eac6c5b4ba4d317d4c4e1ee66b53184fef64c5a19ee78a604b11b58addebbcb43fa763632b1a689d36ee0331c186a195a7 SHA512 b4fb92acf7a4cbc2700dcb4d83bd4bb6df0edd68b3bab8694620447e6c3f0b6598ef78f3be842acb3d213c1d3dc5db682e4d74cff5e2ade11565753bce500099
 EBUILD iosevka-22.1.0.ebuild 2614 BLAKE2B 7583d366e3311cdd9c531e4ead7de0e41fdfcc689fb3f67def768eae586d757aacc729bc2e8ad0d36d6752e9a7ccf170c8a27026a0cb81626ee21e63752fc49c SHA512 5c430a7db864ea6a79c2212cec01900501da85c6df7a4cb232de63e3023b5995a1be1167b1f866fc1ceae47324ec9276cdc1b4f8fa5a332d72fe094af3d1524d
 EBUILD iosevka-22.1.1.ebuild 2645 BLAKE2B 7681cfd3d8ce57826dee68a6a74ac21dda8d94b9234f354b14eb7d2e51ae600aefeba0fd79bbfe7d9efa271008b49586781b9b0050944c243b65f3156d52d289 SHA512 071ffec636bd5b42b8cde0b832c452703c365cab439d597c475c7f84957d0182730f564af96b08088038448952167b440ccbbeab47374023611f98a5225fbeb7
+EBUILD iosevka-22.1.2.ebuild 2652 BLAKE2B 40e2e672ee5cb5bc524261049c3bf46b45406012ab25ea0e4f85d20705ead00931d736a6aea5e8f25f6f942571ab141265938b77f7a0c510f445ee864152d22e SHA512 481cd9c6e485b083ab84c704ad818436206bb1f82beb49874d8fda8498b884a566f99b80cb3013a0e6ea5018d14688e242d3b4e41058f423a19cb7365bfcf458
 MISC metadata.xml 3320 BLAKE2B ac303a8a7f49b6295bc5f488ae7fdbf732f37c8cc657236ff703bc6391b3477989390f98bee3b59efc95e29d6b2bd9814f6c13c473255ce2be33db7ecd6434f9 SHA512 f2241fcf0f60e5cd1292612eeee8dee2be805de50e2ab22cd5d9b34183c7d8bfc2953f8483cb52d8a916b80cdd918fdb400ae169160b63ba56d9bcc1c016d407
diff --git a/media-fonts/iosevka/iosevka-22.1.2.ebuild b/media-fonts/iosevka/iosevka-22.1.2.ebuild
new file mode 100644
index 000000000000..48ed068767ec
--- /dev/null
+++ b/media-fonts/iosevka/iosevka-22.1.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+# [...document.querySelectorAll('[colspan="3"] > b')]
+#     .map(x => "[\""
+#          + (x = x.innerText.trim()).toLowerCase().replaceAll("\xa0", "-")
+#          + "\"]=\""
+#          + x
+#          + "\"")
+#     .join("\n\t")
+declare -A MY_FONT_VARIANTS=(
+	["iosevka"]="Iosevka"
+	["iosevka-slab"]="Iosevka Slab"
+	["iosevka-curly"]="Iosevka Curly"
+	["iosevka-curly-slab"]="Iosevka Curly Slab"
+	["iosevka-ss01"]="Iosevka SS01"
+	["iosevka-ss02"]="Iosevka SS02"
+	["iosevka-ss03"]="Iosevka SS03"
+	["iosevka-ss04"]="Iosevka SS04"
+	["iosevka-ss05"]="Iosevka SS05"
+	["iosevka-ss06"]="Iosevka SS06"
+	["iosevka-ss07"]="Iosevka SS07"
+	["iosevka-ss08"]="Iosevka SS08"
+	["iosevka-ss09"]="Iosevka SS09"
+	["iosevka-ss10"]="Iosevka SS10"
+	["iosevka-ss11"]="Iosevka SS11"
+	["iosevka-ss12"]="Iosevka SS12"
+	["iosevka-ss13"]="Iosevka SS13"
+	["iosevka-ss14"]="Iosevka SS14"
+	["iosevka-ss15"]="Iosevka SS15"
+	["iosevka-ss16"]="Iosevka SS16"
+	["iosevka-ss17"]="Iosevka SS17"
+	["iosevka-ss18"]="Iosevka SS18"
+	["iosevka-aile"]="Iosevka Aile"
+	["iosevka-etoile"]="Iosevka Etoile"
+)
+
+DESCRIPTION="Slender typeface for code, from code"
+HOMEPAGE="https://typeof.net/Iosevka/"
+
+SRC_URI=''
+REQUIRED_USE='|| ('
+MY_BASE="https://github.com/be5invis/Iosevka/releases/download/v${PV}"
+for variant in "${!MY_FONT_VARIANTS[@]}"; do
+	my_filename="super-ttc-${variant}-${PV}.zip"
+
+	[[ ${SRC_URI} ]] && SRC_URI+=' '
+	SRC_URI+="${variant}? ( ${MY_BASE}/${my_filename} )"
+
+	[[ ${IUSE} ]] && IUSE+=' '
+	[[ ${variant} == iosevka ]] && IUSE+='+'
+	IUSE+="${variant}"
+
+	REQUIRED_USE+=" ${variant} "
+done
+REQUIRED_USE+=')'
+unset MY_BASE my_filename variant
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
+
+src_prepare() {
+	default
+
+	FONT_CONF=()
+	local vinternal
+	for vinternal in "${!MY_FONT_VARIANTS[@]}"; do
+		case "${vinternal}" in
+			*-etoile|*-aile)
+				continue
+				;;
+		esac
+		local vname="${MY_FONT_VARIANTS[${vinternal}]}"
+		use "${vinternal}" || continue
+		cat >66-"${vinternal}".conf <<EOF
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- Enable this config to change your monospace font to ${vname} -->
+<fontconfig>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>${vname}</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>${vname}</family>
+		<default>
+			<family>monospace</family>
+		</default>
+	</alias>
+</fontconfig>
+EOF
+		assert "Failed to generate ${vinternal}"
+		FONT_CONF+=( 66-"${vinternal}".conf )
+	done
+}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 92ebbfe01240..db40181b0dda 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,10 +1,10 @@
 AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
-DIST noto-20201226.tar.gz 903613276 BLAKE2B b6ae0357a854b775ca43768609775624370d2f13ae65d05e699105cfacff4bb919ca19f757d4f2fbfde2d24fdfe6c5d6d3b5993a071b0d081948ef8ed6c5eb76 SHA512 240ae214729388e7000a4e12a1fc81b0b562ca6f3fcb4fcdef66a27c1b193825fbf2d0fd4cc8fbae4cd17f57e21fd1589150cb02b7b618d670742692b748f9ff
 DIST noto-20230201.tar.gz 1006343445 BLAKE2B 42d8c4777751f28d03ef45335e75f8c7b267f80a83dbddd9d6939a8e43f194bea95691d2d9e9977244a2e33fc9b29967db7fb1211c8ec1ca4a1a6232ed740ba6 SHA512 3884c89659823fa25d95c48edb89856068d506eec36645e2f0e06f7465d3feac28b68c71d584ed513c7ad1e1d2b322a6be5576ebf15963fe10c92d25461e2fa3
 DIST noto-20230331.tar.gz 1020818875 BLAKE2B 82df27ba94a15ba16fb7c47168ffd9684e030f478c91b98c7c99b97f9d0179f2124ffd68e662dab3edd1643ce032c35e4197d6f8c4f206a621a53b894b0c19a3 SHA512 e839a942e358b37acc47f57f9046a74b2370938b02de686d3dc89532d7ec0a664945f5010bada332466478b7b0d3b4866ce17ac568300ccee2bc27ee9da9e838
-EBUILD noto-20201226.ebuild 1428 BLAKE2B 2878d731ce90d40ec7c0c0f22fd60c4bb2d99e1454e17304ce921ca6a6c4ca427f1f452823c458239ddadecc399b490f3f279bd339e9cb9155aafd2e1c655c77 SHA512 afbc4795e26b2ea47780e8f4ef59112a985b312d556ccae094a499a28e1cc8940d377e58c3d5b55e40ba8e6c38d3c025dd5485b577d7cc3b89b67aeaa0ad89d3
+DIST noto-20230430.tar.gz 1020909284 BLAKE2B 552d52204409fe143436160c2378b7ff0bfc0bf9f3e6ccbf22cf712b73d3a598c08f02399005b46f6d8701cec3537a2dd7a254a5ec036fa9f68dfe33326de1d8 SHA512 04af7b86089194b7428bda530d0a92fda2a62858eccf23a694dc0ec4c0506ca5afe944c0fb4ae9efe6f57aa6983f3f6dd681efa829abbffd82ec1ecd901f09fa
 EBUILD noto-20230201.ebuild 1331 BLAKE2B 34104c993ca3dd42357b5903c4c7a3f574c31833a18f55e8062eb0524950e89a3d4324f7aee276d579081ec2fc5e6f30ed6b83d9dfaf0472ac4fc2b78d90c256 SHA512 c11948ca12b43f314568b597663e32fd0844fbd52749d68a150c3d31059934456e9db6a71238fce339c7a57ad2d86a347f7e45441311710af1e60a4dfe28ad13
 EBUILD noto-20230331.ebuild 1338 BLAKE2B dedbe922319fa20d1c44258e0964b9b25693fd8e30131c36577af0685cf5f6d714dcb49e4bdbcf590d14b60b70b9ac0d10c94f6b303cea6586ceff377e6d1fae SHA512 847fe46602c30311c344d3fe27f1b467b92c0cef8821502429201098b3f1d02dadda591b1d70f3093a41971616f06311b95f0cd1ae46b2fbe14abd3a2cf66a83
+EBUILD noto-20230430.ebuild 1338 BLAKE2B bcb8c1d66acb7860551a621266364a5463323154d30f49254dcc86fe926eb360d1cd891b014d0745ba47950004bd27ed089a5ddb66a2fdd7c154be1cc2703c62 SHA512 c976da1a2e46e9eddfdfbce5ede85e213db08d9ca44a6a8556948b11ef95d13b91b7ef283a199ee4e1eee24aa5055f94e8113222d7a21500b92bd254d5dced77
 MISC metadata.xml 564 BLAKE2B 8a5a57d0c7d0595cd149b35ca37bb0657a59e32c8be70ab9f1db87f091fa2c725be532cc6266c05440582fb4b0a7bc90c2e96eb9ce54a4c957d48f25e5daf504 SHA512 058b6a482169a2b4839f79de7ff1eb98bc98c4592785cf7d431d69bbf6622ac620b718670a248011d42a258620a35fb98c7e992adc0bfcdfc8488698a891ddde
diff --git a/media-fonts/noto/noto-20201226.ebuild b/media-fonts/noto/noto-20230430.ebuild
index 2244af06d801..7e905f36b28b 100644
--- a/media-fonts/noto/noto-20201226.ebuild
+++ b/media-fonts/noto/noto-20230430.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit font
 
 DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/notofonts/notofonts.github.io"
 
-COMMIT="2b1fbc36600ccd8becb9f894922f644bff2cbc9b"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+COMMIT="8f03a57b371df199e1c73b2bd5d342fbbe4ce840"
+SRC_URI="https://github.com/notofonts/notofonts.github.io/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 # Extra allows to optionally reduce disk usage even returning to tofu
 # issue as described in https://www.google.com/get/noto/
 IUSE="cjk +extra"
@@ -22,7 +22,7 @@ DEPEND=""
 
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
+S="${WORKDIR}/notofonts.github.io-${COMMIT}"
 
 FONT_SUFFIX="ttf"
 FONT_CONF=(
@@ -33,14 +33,12 @@ FONT_CONF=(
 )
 
 src_install() {
-	mkdir install-unhinted install-hinted || die
-	mv unhinted/ttf/Noto*/*.tt[fc] install-unhinted/. ||  die
-	mv hinted/ttf/Noto*/*.tt[fc] install-hinted/. || die
+	mkdir install-hinted || die
+	mv fonts/*/hinted/ttf/*.tt[fc] install-hinted/. || die
 
-	FONT_S="${S}/install-unhinted/" font_src_install
 	FONT_S="${S}/install-hinted/" font_src_install
 
 	# Allow to drop some fonts optionally for people that want to save
 	# disk space. Following ArchLinux options.
-	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.tt[f,c]
 }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b05108ec504b..0f32f96c831b 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kcolorpicker/Manifest b/media-libs/kcolorpicker/Manifest
index 1d7d4cce66e2..d8dfc8b53207 100644
--- a/media-libs/kcolorpicker/Manifest
+++ b/media-libs/kcolorpicker/Manifest
@@ -1,5 +1,3 @@
-DIST kColorPicker-0.1.6.tar.gz 12028 BLAKE2B dda08211b56186a34afa9049a2770d98b25659fb0e9fed344f9305420ddc5f69517684236d2d1b1613cec0661f6af43fc463a0cc403bead27d0b6c535030d7d4 SHA512 9702b0dfd9d340aa2b043711b27f2ac1994ff6cdd06e912deb410bd3500a2b68fa046d91bbd1392f3c95905e4cf7660819d70864cc85e55cb4c8879e820e7cec
 DIST kColorPicker-0.2.0.tar.gz 12735 BLAKE2B 39b0c80ec5b498800dd251901b0bd57c839693f071185afacefa8d5a715ff18f2297c50486d98871471c40e0904a07ff40198b548d9368937b120a1eef07929f SHA512 44f9f317ebe5dd3131a9e44071f9f5b397b0d5cceece566f3ecf19932c8e36dafe1a434e623239421bead9413f0859bc3380174d7f14843770691e4d15a956eb
-EBUILD kcolorpicker-0.1.6.ebuild 746 BLAKE2B 3a9a0d72af85c2ab13233e75f94e67ea1b4d2c9257af716f18a6b4439f1a1e7c7abf1add00462a86aca387931bd41b2843283121a3e0d88dd3f52f036eec0dd9 SHA512 9edfc22cc8ae8d2e7177e8517d73b606a24a1dd8b6f52897b068d1d0df99d3948d9d34f274fd0b7cafe36dd3ccc4fb40bc5a48eeccc309d596bee9b4360a4e3b
-EBUILD kcolorpicker-0.2.0.ebuild 756 BLAKE2B a3efd88cb5b93b660926ef46059b9a677ccd81755f492afc5e856991ceb929bd29f9c61d6a6ee79c09a7a26b6bf519ce7531ea6bdccd36a6bd2fb8ebf6b4d76a SHA512 125422e7b7c46a980b32bbb77433d36c43efbf897808059692ca58ff1a20cfe921a630bb9c09ac1b06f54dd64244fd964f8cf733c1b77da7793b6cb202fc083d
+EBUILD kcolorpicker-0.2.0.ebuild 753 BLAKE2B 64d7773a51e83780ef30f2200d3d11031778560313c808164eb9fec1d7e0dabf10a3f4ff7e4a1305f295a8c18d8e0701bb6362aed12914f555547690838e815a SHA512 2e446279704de70a27f5b7d75c25e70e4cfc70bffb06afcb9c70d6495a376020640ae941dc57fc860af33749c04e7894a74672b427986b7f04df8758d424a5d4
 MISC metadata.xml 613 BLAKE2B b96e90131adc5be0575362e88ccaef939d42f532ef2694af9a77ba71dd6b6b930a30a12dba331e9819727fdc717e6374b128981004ce7af3f06728c1bea995f1 SHA512 e2b7fde171e6d3a528aa02f4130bf153e6a63eafce449a0a092e7a3d52b36a8126e3b496de1cc66d5dfe3c7623a62ea9693d96453cbf0ed5ae4fbde2c15c287d
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
deleted file mode 100644
index 60dfc3b9c959..000000000000
--- a/media-libs/kcolorpicker/kcolorpicker-0.1.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kColorPicker
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Qt based color picker with popup menu"
-HOMEPAGE="https://github.com/ksnip/kColorPicker"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5[png]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild b/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild
index 2963e9a9562e..c404fd9f681d 100644
--- a/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild
+++ b/media-libs/kcolorpicker/kcolorpicker-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/kimageannotator/Manifest b/media-libs/kimageannotator/Manifest
index 0bd143fc5117..626f2dfdca52 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,5 +1,3 @@
-DIST kImageAnnotator-0.5.3.tar.gz 219782 BLAKE2B 30f532a563761a665da1f926629ebd66888f820b305c98f2b0afc316d8a94010196e68221a4ffd4871ffbae19582eee685af56c763f873b38a7ac5219f4a3b3d SHA512 a858e0f8694f3f989c36db586e6e3a302ad2aa9bf32b26afa170c165327fa33b6f3053682420c788f701abdea4daa35158058edddf52af1566364976b2d2f9f7
 DIST kImageAnnotator-0.6.0.tar.gz 257662 BLAKE2B 3736d0e862f1d3f3f9728e4d4d611c7e406d40fe022a2441b1a80355997d86a194064ecade63b7657d3cbf1f63364b8b74654d9c92d809ac056b7dc999d97415 SHA512 5782acd552af2297813164c0612810ec0d2127c174773040d99ec9d281f3575832b06667736a5521e88fa2d57ea6410e42a5d95232cb2dbdd9608917e5d6e896
-EBUILD kimageannotator-0.5.3.ebuild 843 BLAKE2B ffe4a7b9328e2e14e2e336a50d9c2ff8a216c7dedcee21f970dcc84c8373a872393115c232d333b4f125b7c7ae581189d54dc0a6aaa37a8787cd22fe58020f02 SHA512 de46ae33b992cf10c772d3ecef8f8df34bb210b0aad92d0423467370a922e089c40c236ed342a94c6f87ef9e5ff9be0a92e6350887a715a543f6cc9fe132d222
-EBUILD kimageannotator-0.6.0.ebuild 905 BLAKE2B caa9afec02624d480654ba93550120bdeb993a0467c3028c825cd2c76cc6a651ba12d3e4beb2f338d6b5d46f7eed0022917538c7e1563195f63c91665ea16f8b SHA512 6a46d6cc55a4c449b115d7669b717146c24d9937fc3a16ca5927d11ed0ff478c00f43466b76beadf31b2adcb6af8be855106ebb0dabbb2d243e57f6ba6af4bfd
+EBUILD kimageannotator-0.6.0.ebuild 902 BLAKE2B 8ee135ce80514578040986d15c2365d1b5007cf84e63ce3f302a685b4f059a027ac7aacfffbfdba71dc041df300b3a1e38e41052e9bff8720e4b1ecfdcda9baa SHA512 44218e165039b3898a2788343d5a9db0521104f6b242d35c22c0b90629fccf83827c1a0370527b18fd422272cfba4705b979f3aa75f469eea9b1d2e9c1d67464
 MISC metadata.xml 398 BLAKE2B 200972ac3dfb66315d1fcb8a3920f79e02cb5e7af2d46edefac2bc3094d8ea114a2fc6517b47bc590bd30e79fd5fdd32964d4bb228bc204935b9db32b0caa7e7 SHA512 a778611b727bf8a2fddc15acfedd2d52024f2c8fc2c46a33950818f8296ce8f97411814caf01f918e2dfce1c283db2a2928c7758f7594d49493edd2ef9de9dbc
diff --git a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild b/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
deleted file mode 100644
index 5212919e215b..000000000000
--- a/media-libs/kimageannotator/kimageannotator-0.5.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VIRTUALX_REQUIRED="test"
-inherit cmake virtualx
-
-MY_PN=kImageAnnotator
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for annotating images"
-HOMEPAGE="https://github.com/ksnip/kImageAnnotator"
-SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-	>=media-libs/kcolorpicker-0.1.6
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
diff --git a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
index 73229b1a5341..c80fd7661803 100644
--- a/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
+++ b/media-libs/kimageannotator/kimageannotator-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6d4b73d1933c..4dd92ca0373c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,6 +7,6 @@ DIST mesa-23.0.3.tar.xz 17627728 BLAKE2B e716d9ddce3da649239c1bc37ec208b9669f316
 DIST mesa-23.1.0.tar.xz 18204148 BLAKE2B 47cc90da14a2c33bb54c7811e99b439fadef81a15b63e535210a329bad5e2524fcb415cc5ed51a8deb65ccc9a341af78f02178c93758f09946978179e494382c SHA512 bbcfd0dd8e5414826631e80edbbe48218115a7461ef4ac1f2e4e090a48d6c0e1ab3b51dd45e988d5f1572f29bfc03c33769263c0f3e04033138d5b1ec102e8c9
 EBUILD mesa-22.3.7-r1.ebuild 12130 BLAKE2B a735afabb891b4b8600c5f00046496b12f845670b461f7fa078987368a2e0600729d45031dab04a7ad65a877df37445d33b25111ad43a65c0847f5a241bdf3d0 SHA512 c115092f8a8583f5f5bd71791541a6ff989b78b612a90ed95b9c189acb4ba9e3676269ad19e68df24b78dde8f84ad549e4976da7d50d9e6ca5c963d4c163192f
 EBUILD mesa-23.0.3-r1.ebuild 12279 BLAKE2B e6da53781a68ab1705eb35403ff2349985ed88d3d23ba1772b060185fca16fd28c94061fd97ffee7caad4b8cacf8688dfe42db7ce8f2a0b4d894d4dc8ee4966c SHA512 205bdcd6d31efe9b54af48f9cc8e13ed2ae65590408ffcb3b7be23ea86f56965a2b9a76c2b71d866003f94d17f4e7a84163ae8bdd702b0a20292f0e2477e969b
-EBUILD mesa-23.1.0.ebuild 12057 BLAKE2B c615090aa6588afddf834f3a5774e72cb7e6f6d477205cfb8467abce6f152aa28904540fc972bca6993273e5f44b77ebd4a0281222647f20bae64965bad39af5 SHA512 420afe51abf0188627542951565cca9b82b4841e9c58b115169988b358de7b064f859a4d39cad305c6915f35a9e70f7c53a90b8ceab0c44111b72d0e1fbd0ea6
-EBUILD mesa-9999.ebuild 11975 BLAKE2B 063acc8bf2f6f376a13d4d831e44738fb149d368d1869a1c4dab353972f77b317bee9a8b16f30917b9e4a51cbe6f3c13844da11db96238d35de42a3402882314 SHA512 cf0738b84ec172c49ab99a9ce891d7bcfac8966119673ce7c98d346c7a0bd1b4285154b0bc5e4f98dd76027c85fea84fb98e586a1923ccde15cc664213088970
+EBUILD mesa-23.1.0.ebuild 12308 BLAKE2B 1d14e1a6e6ed4441060757e4face97f93c4559d37ca986b039534962a44078121c68ea405be80b9a12de483bbfb773afaeac5f2a1e8635503bd78e9552d6bc8f SHA512 6abe5a91f383024bcc9369af5ff8646b882131c28fc9706cb33552f61555d53bb6253b937ab58d49099a0ceb3a0a80c6f53bdb87af5bd5277cf2263cd1e5a3c6
+EBUILD mesa-9999.ebuild 12227 BLAKE2B 762246541140b03c8f641647329b833f21d6cc6ca3f1e1d3fd2b29eb97d35a3c2a130b5ab9b65ada21509bf95bbe01291608472d7a5d29d59fdf0db7f88e2f86 SHA512 bff4fc5a87a1af7a1d3e5755a3bff587d60614af65f9bdf4fbbe5decd4027d154b0ca113f1d3e1544e0ec6ac4406976e76d96ce73d293399459cc868094b1f20
 MISC metadata.xml 1607 BLAKE2B e862a9e259e0fb0a4dd73d021105cddd3063d914c0579fa76443fd59a26cf4c3687269ff28de542d7aeb462f42f7ac995dc9fe9a4ed8926c9c0b23205554e7e1 SHA512 fcf927604dd3b7a10a0159a4d25d1cbaf349e6aab8bb00e7c98176d98d207f998b75fa39f343b07edb1d6987b3223d8a5d2bdc61852e4c004f0217e7c8e75459
diff --git a/media-libs/mesa/mesa-23.1.0.ebuild b/media-libs/mesa/mesa-23.1.0.ebuild
index 33e29c1d3f7d..0f1ac3b60433 100644
--- a/media-libs/mesa/mesa-23.1.0.ebuild
+++ b/media-libs/mesa/mesa-23.1.0.ebuild
@@ -37,7 +37,16 @@ IUSE="${IUSE_VIDEO_CARDS}
 	vulkan-overlay wayland +X xa zink +zstd"
 
 REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -78,7 +87,7 @@ RDEPEND="
 	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
 	vulkan? (
 		video_cards_intel? (
-				amd64? (
+			amd64? (
 				dev-libs/libclc[spirv(-)]
 				>=dev-util/spirv-tools-1.3.231.0
 			)
@@ -159,7 +168,14 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
+	vulkan? (
+		dev-util/glslang
+		video_cards_intel? (
+			amd64? (
+				$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+			)
+		)
+	)
 	wayland? ( dev-util/wayland-scanner )
 "
 
@@ -239,6 +255,9 @@ pkg_pretend() {
 
 python_check_deps() {
 	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	if use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]"
+	fi
 }
 
 pkg_setup() {
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2d73380b5ee3..c97b387abfac 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -37,7 +37,16 @@ IUSE="${IUSE_VIDEO_CARDS}
 	vulkan-overlay wayland +X xa zink +zstd"
 
 REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+	d3d9? (
+		|| (
+			video_cards_intel
+			video_cards_r300
+			video_cards_r600
+			video_cards_radeonsi
+			video_cards_nouveau
+			video_cards_vmware
+		)
+	)
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -159,7 +168,14 @@ BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig
 	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
+	vulkan? (
+		dev-util/glslang
+		video_cards_intel? (
+			amd64? (
+				$(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]")
+			)
+		)
+	)
 	wayland? ( dev-util/wayland-scanner )
 "
 
@@ -237,6 +253,9 @@ pkg_pretend() {
 
 python_check_deps() {
 	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	if use vulkan && use video_cards_intel && use amd64; then
+		python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]"
+	fi
 }
 
 pkg_setup() {
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index f8689ccd2a8b..e1550b5b31ed 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -8,7 +8,6 @@ AUX vigra-1.11.1-python-syntax.patch 2590 BLAKE2B 4465e2eecaddc0d8b74f62143fe9fc
 AUX vigra-1.11.1-python3.7.patch 1254 BLAKE2B 24e23db29992efa86154edb402e250c782160ba5208fd7b2dd1c1eb0526b51633014cd488b5f8abd808bb2fc54b20866111281447fc45683d70a9a8bd93f0854 SHA512 9cbaacf2b6e3bd892b930c48d2371fe96b9cfecc69c8d0c982972c412f1157a73648672f42e73df1cd5ce0753c69907faaca38e35bdd54952a753af7054e17fe
 AUX vigra-1.11.1-sphinx.ext.pngmath.patch 1411 BLAKE2B 6ffdd2f40ac982d693a6e71a89754d453202ba70e6ae65b3b45d64add3d2cc7a9710773e94b0604cb67dadb53ea27912ccce7fe844e6264f7c989bb96149cbcc SHA512 4e0ade84985ecc9c7c45afd949671b9cbc041db486c29732b17c1b62eadfdf6e299396a18686c03c3ed4e2b3ac6d830a8e224c56e3b8d20361c2f5e5fcc14650
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-EBUILD vigra-1.11.1-r8.ebuild 3704 BLAKE2B 43e7b0d410d2c74a97d84beb7793d606eb9d4d39e281dbcf78bb7b81aa834cf0adb0d926377cbbc270afade683e692e9b18ef878daf0ef3e8f4b0b9b0fcce447 SHA512 5ea96276ca6653e126a6e5996106ddfbde61b749e6159bd3d7dc75cc655d9551bc0c3a14514ded0a41a338a28e58667972273edb30ef763fddeed2ff3fd479d2
 EBUILD vigra-1.11.1-r9.ebuild 3744 BLAKE2B fdda5deaf313364556ddaea8afcfab18b402f4e6f2d8354bb07fa96ef10478c32d58d02d8724c7561299a4fcc13e2002d6143183ce88ea5a2429700f931654be SHA512 85b48dfc3901e8fbc021c9ce3772b0209df84fddc6be655e3f8e08104849a343ff636964f4217517abf6943688420c85c1831bce79df5351ddad9c26d93f9b86
 EBUILD vigra-9999.ebuild 3484 BLAKE2B 134148a0e733cb4c3f6f9a952908feb924842bdf33e27135ad24faa3d528316bd16d0ad2d8a71e276805f7b11225bef3346aa92f651d342057c0f13edc30fe8c SHA512 10eaa67a2c72f9139a85f4540cbe59f3a59366288ad38ecb7aa7fb4ff46c0abcff8ae77cc3b8bb4856b2898e3acaabe5b2e9e0482069e7193809e4759bdc11b0
 MISC metadata.xml 338 BLAKE2B ce8cddf2fde724bf72d4e61054b4cbe18f40a34e02b34326d227a184d9eac1133bffc48a373f8d2bcc5c5d13de30263c3029a566db9fd6d4442f779be8e97ef7 SHA512 e4242661592f929fdba417b1fa4c176db354d82c7eeb9324a3a6102d3fb405267411e27313666fd9201af1da49de9c1319179c42017273932365113ddcd5a4a5
diff --git a/media-libs/vigra/vigra-1.11.1-r8.ebuild b/media-libs/vigra/vigra-1.11.1-r8.ebuild
deleted file mode 100644
index 8e05bebbabd4..000000000000
--- a/media-libs/vigra/vigra-1.11.1-r8.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-inherit cmake flag-o-matic python-r1
-
-DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ukoethe/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ukoethe/${PN}/releases/download/Version-${PV//\./-}/${P}-src.tar.gz"
-	KEYWORDS="amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib"
-
-REQUIRED_USE="
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-BDEPEND="
-	test? (
-		>=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}]
-	)
-"
-# runtime dependency on python is required by the vigra-config script
-DEPEND="
-	fftw? ( sci-libs/fftw:3.0= )
-	hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	openexr? (
-		>=dev-libs/imath-3.1.4-r2:=
-		>=media-libs/openexr-3:0=
-	)
-	png? ( media-libs/libpng:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	tiff? ( media-libs/tiff:= )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${PYTHON_DEPS}
-	${DEPEND}
-"
-
-# Severely broken, also disabled in Fedora, bugs #390447, #653442
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${P}-fix-incorrect-template-parameter-type.patch"
-	"${FILESDIR}/${P}-boost-python.patch"
-	"${FILESDIR}/${P}-python3.7.patch" # bug 701208
-	"${FILESDIR}/${P}-gcc-10.patch" # bug 723302
-	# TODO: upstream
-	"${FILESDIR}/${P}-lib_suffix.patch"
-	"${FILESDIR}/${P}-cmake-module-dir.patch"
-	"${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308
-	"${FILESDIR}/${P}-openexr3.patch"
-)
-
-pkg_setup() {
-	use python && python_setup
-}
-
-src_prepare() {
-	vigra_disable() {
-		if ! use ${1}; then
-			sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \
-				-i CMakeLists.txt || die "failed to disable ${1}"
-		fi
-	}
-
-	cmake_src_prepare
-
-	vigra_disable fftw fftw3
-	vigra_disable fftw fftw3f
-	vigra_disable jpeg
-	vigra_disable png
-	vigra_disable tiff
-	vigra_disable zlib
-
-	# Don't use python_fix_shebang because we can't put this behind USE="python"
-	sed -i -e '/env/s:python:python3:' config/vigra-config.in || die
-
-	use doc || cmake_comment_add_subdirectory docsrc
-
-	if ! use test; then
-		cmake_comment_add_subdirectory test
-		cmake_run_in vigranumpy cmake_comment_add_subdirectory test
-	fi
-}
-
-src_configure() {
-	# Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
-	# bug #808731
-	use hdf5 && append-cppflags -DH5_USE_110_API
-
-	vigra_configure() {
-		local mycmakeargs=(
-			-DAUTOEXEC_TESTS=OFF
-			-DDOCINSTALL="share/doc/${PF}/html"
-			-DWITH_HDF5=$(usex hdf5)
-			-DWITH_OPENEXR=$(usex openexr)
-			-DWITH_VALGRIND=OFF # only used for tests
-			-DWITH_VIGRANUMPY=$(usex python)
-		)
-		cmake_src_configure
-	}
-
-	if use python; then
-		python_foreach_impl vigra_configure
-	else
-		vigra_configure
-	fi
-}
-
-src_compile() {
-	local VIGRA_BUILD_DIR
-	vigra_compile() {
-		cmake_src_compile
-		VIGRA_BUILD_DIR="${BUILD_DIR}"
-	}
-	if use python; then
-		python_foreach_impl vigra_compile
-	else
-		vigra_compile
-	fi
-}
-
-src_install() {
-	if use python; then
-		python_foreach_impl cmake_src_install
-		python_optimize
-	else
-		cmake_src_install
-	fi
-}
-
-src_test() {
-	# perhaps disable tests (see #390447)
-	vigra_test() {
-		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake_src_test
-	}
-	if use python; then
-		python_foreach_impl vigra_test
-	else
-		vigra_test
-	fi
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index d85485084481..889d3e81e05e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 56e94010e650..48789f4fa3a2 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-audioencoder-flac-19.0.0.tar.gz 41951 BLAKE2B c2464faabe31035d7d04eaff3ab8f36bd4a47db76e17bf821261fbf28377c94ed94df314cc01bbc06bfa2d8b4f23a13d40c7e9dbfb47d5dfcccb141e34a2f17a SHA512 a870069b7283f2d870327675353e79942ddb7358fa042b51b21f940d0c128700619274afaae2d820b7a2bfbd2289e4cce2d2075d4a10cebc6b15d014f77fd1e8
-DIST kodi-audioencoder-flac-3.0.0.tar.gz 27573 BLAKE2B ccef84245eb6ce23527b33900e22e304282477eccca728f5a899db80d7b1f64a00fd1de65f4303bf4261554c038d48adf49f417a8161a9359e9ead81c7288a7b SHA512 73dd9526a498dd92076eb98044f75baaeb4dd93251f6a9a2d9e9a9a8553fb9b047b861b8518c2fe2803ce06cd794a5436f80561bedd82de1fc2df727f28d1b7c
 EBUILD kodi-audioencoder-flac-19.0.0-r1.ebuild 838 BLAKE2B 8876d70e84b2c27840ff58b807ced19ba346c5b65a1f96ee3c047ad0e74f20d54e8efaa0ad58357cf6681f0a75de79db95571d9063b56eb5f7ea7b1c71c66b14 SHA512 d5f7232049cb1a71671261e3118fa9186d5f47072423444694f706d3f1261d47cdaff05dc7528757926ab933128b040ee18c59dabf02b11bc942260f3869ccc5
-EBUILD kodi-audioencoder-flac-3.0.0-r1.ebuild 838 BLAKE2B 4237282a2f504883dd346014173b71d4326d849da08ab8b09f954d42bba555047a198912ac33d4842ec1c3d58d277421329632779cc36434955fa1f80c74737c SHA512 73b461e4c58e13dd9c5832f454b110cd0a0a87d5f503b8d5f18060108ce470dec90b42485b70c882a16f89240101831e59c74ed82080c8bf0c745e1aeb0d0b83
 EBUILD kodi-audioencoder-flac-9999.ebuild 838 BLAKE2B 8876d70e84b2c27840ff58b807ced19ba346c5b65a1f96ee3c047ad0e74f20d54e8efaa0ad58357cf6681f0a75de79db95571d9063b56eb5f7ea7b1c71c66b14 SHA512 d5f7232049cb1a71671261e3118fa9186d5f47072423444694f706d3f1261d47cdaff05dc7528757926ab933128b040ee18c59dabf02b11bc942260f3869ccc5
 MISC metadata.xml 366 BLAKE2B 12e4012ee698e6cd0929b50634e680d084a639341561d724d9c7a47c9754a2941df9cc217c0c0732c2f0e712ba9734fa591f1e2f8b039b4e21ecf5f19b4d1a61 SHA512 e1ab1e85c61e4caabb92850fe0f01adcc5d2dd158459604971bbca4cc60abcb4b0779d86754902a00bb60a670998d812f6a65b5b36d623753ee1e7bdcbf537c7
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0-r1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0-r1.ebuild
deleted file mode 100644
index 80c7fe888c87..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libogg-1.3.4
-	media-libs/flac:=
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index fd7dbf18f8f9..01c3d5aa269f 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-audioencoder-lame-19.0.0.tar.gz 35760 BLAKE2B adac00f1d2b2cfec25e8c5f01517f5f96e1121225d7c9955508b53960f35a35d81bdd2d22b5616685439d4490ff33b5b6d8839b117278e46270d64cc10b27bae SHA512 33d7406d43801049f8e75ee0adf9cfef504dd324a2b62a9a37576a75d34ecab1e863b400c7df5484be5db64e6acda4f2572d9ea5532220d86dae9538d6d5fd5a
-DIST kodi-audioencoder-lame-3.0.2.tar.gz 28690 BLAKE2B 5c3b5eb10b74e3d559ec8ea95ac005a7c75db9944e26d5d62a3f8842627fe0427e2a68919035a4ad52021a4a87379755217aa1372ce7edd3342df3be35cf507f SHA512 28a8c95804292820e07e96b02b206fe7fcdfe93c0e7113cf5d2f9fb43f718f92fdbe3686441064e55a9de1674a40c3ba9574db5e44d24cbd2397feafd97e74e2
 EBUILD kodi-audioencoder-lame-19.0.0.ebuild 823 BLAKE2B e03af04460930813891b88988459df497d93776377961d684817e1d93e5eed15ffcd151d2f2aa2f9f1642b3aecdd9afb85755f8b0987ef156084b5352cd18d5d SHA512 820bd8ea405a22461f26d7f28c6317812b39ecf8f56cbd1cd94a4b19cb6ac7bf0014810c760a89910c921e8be8d7243b936af6e87532dcfeeec27a354633f9a1
-EBUILD kodi-audioencoder-lame-3.0.2.ebuild 823 BLAKE2B e03af04460930813891b88988459df497d93776377961d684817e1d93e5eed15ffcd151d2f2aa2f9f1642b3aecdd9afb85755f8b0987ef156084b5352cd18d5d SHA512 820bd8ea405a22461f26d7f28c6317812b39ecf8f56cbd1cd94a4b19cb6ac7bf0014810c760a89910c921e8be8d7243b936af6e87532dcfeeec27a354633f9a1
 EBUILD kodi-audioencoder-lame-9999.ebuild 811 BLAKE2B f3c905dbeea54b523c934acd07ba0befdf1656bf4b791cbc0e371d7b2e54fcc39c3733f0c01471b913c51171c8435610148805c749a86d7b9dce29f1282a495c SHA512 20d794cf201afa804273a2ad20fa693b123790b49dcfc9ae9dcbd87c11ad7643191000fc1391cbf760047ae61e9e6d47e45c0820ae67c5519c8d6dc8b8c040c7
 MISC metadata.xml 366 BLAKE2B 000325147dba519bc307f2c231a16f942965f16e2db7e08fc83f38efe6f419da6cd99c4423ab3718d597b66d139d8bf6b3bd2f92b9b7d112af7f7cdaa534636c SHA512 5f972288c26d0ce556a0d17faf9c6e7f631b111926323066f6ec500ab2a059aa3327d7c0a7deb8d0c25aa5f657effd8f29708c1f92949a2b4713b8efb4e18f4e
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.2.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.2.ebuild
deleted file mode 100644
index 5182bd5788c3..000000000000
--- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-3.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Lame MP3 encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-sound/lame-3.100
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index e2c621ee6c55..c4db77692ac4 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-audioencoder-vorbis-19.0.0.tar.gz 32058 BLAKE2B faeabd15682b244e19bbf93dbf3a6d69642c803a640b6e2cb0ae5a73a40c47afd18179d3ae4db8e032bf5d59c6452d54176a8c4eed6ce30479d6cbb3c2b4aa13 SHA512 3f6cec4ec4f2ab6af674c3527b85f41025e7df512a521883de9bba719b85d41ff2897294d616f9294b8cd794b290ac7e4dda8dd252bcc3a47c723bfb2e7e526e
-DIST kodi-audioencoder-vorbis-3.0.1.tar.gz 23518 BLAKE2B b995969f3d23ba0af692f571a7a92855b73d99f7360b169b7e69bb6e8cb6761de430a80041eef101025c9d83b05479780f3c67785161516d81934fbf07fb78e3 SHA512 f0e9e152574881943f4c8bad6e8249e502590503104e5c456858e25634004c223e9be91b274b2870dd07327254664f7ffa5549cf573241192088a3287d2511ad
 EBUILD kodi-audioencoder-vorbis-19.0.0.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
-EBUILD kodi-audioencoder-vorbis-3.0.1.ebuild 860 BLAKE2B 3e5402c69dbe6e1e8fd6e7f6e8c3ed1f3da39bd4de200da0f5208df7bb979fa58c6b2f994a878a6ade2647133acda1514bd622ee82660d3e44d30adab382143f SHA512 73f1ea46308124406678b8f76f92a6205ac8d39d68d3d1990dc3db3f530c3efb748e4ce2fa517f18b4237a673369ed05f3569e29108dbdc9508a95141268eab1
 EBUILD kodi-audioencoder-vorbis-9999.ebuild 860 BLAKE2B 048888c59b60be0dbc4bf44503358f0eb8ae637606841feab58bbd6428a2206b1d952eabc7badb4f615a66488136e48921c07b7df2861002cc1db1995fcd7027 SHA512 d9022fd48097e4293b2256cf7a36967132afeabf360c0f3be9a8a0a7a9e5d7712ad47f269629d3768f9577595b8f5c605442626c68ddd5a331e66f19248f112a
 MISC metadata.xml 368 BLAKE2B d740ed42e7b7b10d28ebb69a4f4594160f50e4c21286857c3b627c5840a281b18df7e68b5e647d5066e8df33aeffee3fe7dafc7bd51f901ceb1577628a453856 SHA512 9077afec2e562b90581240985484fce98c1382bdf54dd8c5e753f8bbb654922d294f3dac874bc051bd86d4d1930bacaa21f5e7090926e7cbcedbf10af84925e1
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
deleted file mode 100644
index dc5d1ea70595..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libogg-1.3.4
-	>=media-libs/libvorbis-1.3.6
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 7eaa54ab2e49..d84dd6f57a28 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-audioencoder-wav-19.0.0.tar.gz 18624 BLAKE2B 4548ce324e61f733a7e4eb6301cd1d13058c0257bf55ea0a1ed8f5c9be8dbd801e0b3337050d1b3dcf626db7f75f3bc91d3d68a5949efa6ab5bf581b073754fb SHA512 4bd41137a84f738e38f56ef79f8bc5d69c5d45e64fe6f724a23e6b8ee70cc44085032122709e9bb7b0a384e63caf5317de59a54ee05669e286b39ed1370fe787
-DIST kodi-audioencoder-wav-3.0.0.tar.gz 17665 BLAKE2B 048915e147bd40f03db6b1cdb02183e1c68c298fe2251cc86a86fbfe2259f70fe17ede46898d1dc5b7d0261454fe0a65d74b8ac3cb19f465ef3eb8b6c1f5be33 SHA512 68673e432d377b895172e398628c5dfd506bdb46c83c38933d0d674abaf1715d44e488d4c158d27c0480b92a947f21534502aa8ed473e9225c37f62e28b05512
 EBUILD kodi-audioencoder-wav-19.0.0.ebuild 655 BLAKE2B f64893238ebb7eef14c3376509183d3e699e611811dcfcdaf364a911ff24b13637a168a5489b27a38bdf4f3586a28b2cd1dfd4d02d858d35640b90563461e993 SHA512 1b6ed7805721d424cc0ebbe6e31b2f82a0626c2d22fe13fb1001f30a54f26571f5a5097701808cca6150992e49dc86a5928b713daf7441e6857f12a8ea39e70b
-EBUILD kodi-audioencoder-wav-3.0.0.ebuild 655 BLAKE2B d999a837ab23fcd34cc52f2bba451db7617156813c206c2ce8cbf4584d4584db2d22c014bbb3ad79ccf7574dd739ba40d12d897cbc1c78cd9af8b3eb742dbf9d SHA512 b5be906101342ea837a218e71679067fe778690363f63deb805bf9b3ef83227d67a7e89c5057aabf326b2d3239625823d7e18c373161a42c65221f4311e469e7
 EBUILD kodi-audioencoder-wav-9999.ebuild 656 BLAKE2B 29ade224eaa01c5904207874caca846523522d8632f411900dcaed926db7e1ebe0fe295bed9e79e654179fa4bb232a48083a4932b942d35c7886ca8e52ccde15 SHA512 677d1ee2a8e56bc6b235c857f9028a4798805b4cd86ac7cf854ba6284ba1c9b58138590fcfe8afc6be6c189638832dbd4ba50bb6aaef60d5dab22f627d19df96
 MISC metadata.xml 368 BLAKE2B d740ed42e7b7b10d28ebb69a4f4594160f50e4c21286857c3b627c5840a281b18df7e68b5e647d5066e8df33aeffee3fe7dafc7bd51f901ceb1577628a453856 SHA512 9077afec2e562b90581240985484fce98c1382bdf54dd8c5e753f8bbb654922d294f3dac874bc051bd86d4d1930bacaa21f5e7090926e7cbcedbf10af84925e1
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
deleted file mode 100644
index 7387ed345a1c..000000000000
--- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-3.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="WAV encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index 7865b368f75a..8f5aed66adda 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-game-libretro-19.0.0.tar.gz 114815 BLAKE2B c18236f2cd96b57b665a191a42932d17e086233de23de2d4227397f110075288d5b5de314edf4e62fa7567fab39a3c95cc1d437fdc1a95a9966ee6a636402e1a SHA512 a746b3b1e962e01af6b26a8f5c35c673f28e1248115a266528c1cd333ec132075948d0ca8d6ac0a5fcc07f80c4f881b0d819d59768b572f93f47daf43bbeff5b
-DIST kodi-game-libretro-2.2.0.tar.gz 110443 BLAKE2B b68c51a0fbe9a61ce9ac5c3582fd317abbc6ef69b5da4a529a7a73201c49f4fe8fba56f73635da213dd02c53af7b3d69dbfafc9a60afecbbef3c451cc32d568c SHA512 f1a5671b468ebf0ea3a86b757ae2481115bfb38082043757aa94d6f193b6eea560b37ccafafe63e686b729d80aa89ac58640899900894d0a72472badadbf27ac
 EBUILD kodi-game-libretro-19.0.0.ebuild 682 BLAKE2B 98598e7815fcf2a429185595581aeccec34e49cf1af9e5d275019efce68a06dea1e8b9288bea0df18ad7888bd0cf4caaf684e9f3cd330e85f62f1245b726e896 SHA512 169a998997c74a5ff17ab86d614e43dec151bbc15366be975b4b934435d2ff5f4100addf2393f8841013ec7808aa9f40c3d29d685667c4d893b54c56a272b7f2
-EBUILD kodi-game-libretro-2.2.0.ebuild 682 BLAKE2B dbc2d96c59d541a0dd4e465a2158ef83be684181cecbacc398921ce91f596ebf13cd8da87dd653771f5c42c01e2b723a7b1ba0d6cd45afa01684542e60611c30 SHA512 4eb201823ce967d20f9e1a969ffabccf512963786ba0b9df94426b11a82043029970dbf36f32d90c35c2ff09d8980599c490b1462a3a728cd9a9c871e55ae6a3
 EBUILD kodi-game-libretro-9999.ebuild 683 BLAKE2B 57220c351b1dcced47b15b4d2a35b545ffe6a77b41e0d95104caf4b7fabde65d6bd97e146309e9aa4ea746836715bf438db31467f579f0f61531f6313b597399 SHA512 ec20589a4caf202b401460f231d75b19b3c4386b8752c83fca6b06310d133659be78b824fd6c787c4f3f3fcc3f86de28720e7cf9501bf5aa7a30d0bb62e1fd3e
 MISC metadata.xml 366 BLAKE2B 000325147dba519bc307f2c231a16f942965f16e2db7e08fc83f38efe6f419da6cd99c4423ab3718d597b66d139d8bf6b3bd2f92b9b7d112af7f7cdaa534636c SHA512 5f972288c26d0ce556a0d17faf9c6e7f631b111926323066f6ec500ab2a059aa3327d7c0a7deb8d0c25aa5f657effd8f29708c1f92949a2b4713b8efb4e18f4e
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-2.2.0.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-2.2.0.ebuild
deleted file mode 100644
index c9b9d57b397d..000000000000
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-2.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/kodi-game/game.libretro"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-imagedecoder-heif/Manifest b/media-plugins/kodi-imagedecoder-heif/Manifest
index 9b75db656306..c4cfef500ed8 100644
--- a/media-plugins/kodi-imagedecoder-heif/Manifest
+++ b/media-plugins/kodi-imagedecoder-heif/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-imagedecoder-heif-1.3.0.tar.gz 32393 BLAKE2B 76981fe8759e93b2aaf5db5452db4fb414d295d637bdd38950fb89ba0e21c9b22a7ed87dc183bd3c47f457c09672348e9af74a9015408ce4214dc847599cbae0 SHA512 63181558f31804a1dd12f4a895535ab303c5e3c5f75b5fcc5bdda892b31a78d9b48b917d85dba66df23a8d118eea83825d24c4b797b289be11169b3a1a29df4a
-DIST kodi-imagedecoder-heif-1.4.0.tar.gz 32045 BLAKE2B 87da40bcb13d4ca26df4563231b08cd9535dca0197d40ed0a2baff991db05978bdaa074ce16f631822b06a660086e222427bc43fe34c153cc6eb1084f790d398 SHA512 a26fc84aeba8a9aaffde3a2187b50c99697df542faffda10b4958db1947fd9c0c4fb7cc02c2e1f959c6d3296ed47430b8d2a0be460aa497ab94fb67f1a25a8e4
 DIST kodi-imagedecoder-heif-19.0.0.tar.gz 34506 BLAKE2B 054791cfc86327e02d21e22c706241603ac425ac73fce5c44513737060dbcd7abf15c34569fbeb14adbd95d4b5bd2bc1ec189b3e6206fa00b23049eeffd8584e SHA512 73e2dc0cdbc4ab99d3c1e96ac465e3a3f834ff8fc9dc900f42f2e04405bac01149fcc6da74bb2f4b6fd6c69945a6700a2ff878e64b3f17c1fcefb1d2f7f640d7
-EBUILD kodi-imagedecoder-heif-1.3.0.ebuild 884 BLAKE2B 1e69301d94bf4bf583c66ded081ff191234fdc87218e9e372c36dd0caec7368290bff4bea2e13a9fc63f2410acd0387d07ff120d038bbff383b96e910369e0a2 SHA512 5807c66ba348329784067c89ff6eab698bf3b037d7d0d9b613f604b0eb24cfeadbd7a771c129f71474ac37421288fa6d7f1781d7da5ed02b4d97befb47dd0269
-EBUILD kodi-imagedecoder-heif-1.4.0.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 EBUILD kodi-imagedecoder-heif-19.0.0.ebuild 885 BLAKE2B 7df430ab0299dcd16b0314c0127d1a9b44fe531d1cf42fd1ac7efc73c6786efb509c33958546d798dabb7d26d83de7385e087bc5917682c35a9316d7909b5704 SHA512 6e3752b8e7f6d24c148c177a46b37f64c1c6dba6bb9f2fec321a4bd59a52c532353d579e60fd30b128e8d03e5a0efdc0d389c4da4a3369ea8feb6c0ad709920a
 EBUILD kodi-imagedecoder-heif-9999.ebuild 884 BLAKE2B 83e813a0cf3e51f8377ede94f298754f0474f673a06f487fea4c8f45e76dab5311055481b3b4428a25d0f22a5fb73d6a7f648b7495bd2d877ad265463c963987 SHA512 76ddbb2f30a8859b74e57c1aba0389195e68ab02078c760cebdfd9fa3b3e667d85034484dd41f8221284c325ff819cd0b22c9eb35cd0f7e05b5e9f46b9ac4549
 MISC metadata.xml 510 BLAKE2B f2923fbfd2c19f8af0d1b7f6d62f8522c187bbf57b296306bf192609787d8c2db94b707f0a02444a921879cbcf9c70256bce69b178493cbc162c491936aedfe9 SHA512 077200d2fffc22666397e97190d1560b3bde8337da361b3b8d0595c3a6b5ccf393b8536b569c7053a86ca678af802ff21b0c19c36abc536bad6c14acac4ec035
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
deleted file mode 100644
index fc5d4d31078c..000000000000
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="imagedecoder.heif"
-DESCRIPTION="HEIF image decoder for Kodi"
-HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="=media-tv/kodi-9999*"
-
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libde265-1.0.5
-	>=media-libs/libheif-1.6.2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild b/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
deleted file mode 100644
index 69a9164cf053..000000000000
--- a/media-plugins/kodi-imagedecoder-heif/kodi-imagedecoder-heif-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="imagedecoder.heif"
-DESCRIPTION="HEIF image decoder for Kodi"
-HOMEPAGE="https://github.com/xbmc/imagedecoder.heif"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="=media-tv/kodi-9999*"
-
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libde265-1.0.8
-	>=media-libs/libheif-1.6.2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-imagedecoder-raw/Manifest b/media-plugins/kodi-imagedecoder-raw/Manifest
index 70c72cd6b638..3dc19cecf11f 100644
--- a/media-plugins/kodi-imagedecoder-raw/Manifest
+++ b/media-plugins/kodi-imagedecoder-raw/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-imagedecoder-raw-19.0.0.tar.gz 54689 BLAKE2B a55e5f9ccd9c4304bba0705eab60b20d3b0b701377c0f770c41b4bde4ada310d618d64e862787279abaeb3f52c0b065effc2666a62b7e960fb156316b59f1370 SHA512 4d0e96db52c43234f27fce0ca9628c57457fbdb002464f1d8b168988264cd4666966f285298b7c0c1f69239d3bb774a7eda827b66107f7851ad265a07d236de9
-DIST kodi-imagedecoder-raw-3.0.1.tar.gz 51343 BLAKE2B 04fb42a64dfd712bcefc6c81af6519566c1cfdfaf97115dec28d4cb05794b918baf4d50179bbc43faac41294b8398f615e6562a310503b13bd18b2d236559bde SHA512 ac4c3a4d042bb8c18340efb2f2929f6301089a407731d6cc371b7b888da978bfb017e0e563d614209bce396f9425c4a618b6109f228c4943282ab4b823f159de
 EBUILD kodi-imagedecoder-raw-19.0.0.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
-EBUILD kodi-imagedecoder-raw-3.0.1.ebuild 884 BLAKE2B 1a4214d97a41f14394cb703087fe016096768634b4b6b941e17971305e02a103cbe1b7fe9ebf6eb047fd274823c110bedb55186fec8f4d0d20a66d386ed279b4 SHA512 6a9e04845544e7493d6fd5277cd9a3926736193c337ceea33dd2b10fe025abace63c18824b6d3cb28de5737dd3b55ba278986cb595c6d91d07559641780e25ea
 EBUILD kodi-imagedecoder-raw-9999.ebuild 919 BLAKE2B 8b6e258977724e80c94ce126b5480230f762aa5aa26a64e48dd332f6295a3f08d4f71211801a599537d397bc1c2fc5a2ad1518fd84885d58ee110f7c3e96bad2 SHA512 6606130180bd5964087944159d0715aea3ec9a958c2a303a494da7698747df79bb9b0f992cd430be1c9f4ac3bc0f06413a1244bf367391c05e74195cb088ac87
 MISC metadata.xml 509 BLAKE2B 1404654b19882d44af2ea59d4cb22c1ad83e60d149f034ec615f3f54735ef5985432048cd75d2310d59d541226c3b532690b97a58fca0e6ff676b248fe1ffdef SHA512 d25d1ea5bbc03d1bbf2628e5c0416d8ef15a75ea8bd031dca215c5fddd972194c3ed2fa2ba879e6d804bff2180321a47b0c20ce626b05454c44b78df0177271a
diff --git a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild b/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
deleted file mode 100644
index 39a7b8b5fcd6..000000000000
--- a/media-plugins/kodi-imagedecoder-raw/kodi-imagedecoder-raw-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-KODI_PLUGIN_NAME="imagedecoder.raw"
-DESCRIPTION="RAW image decoder for Kodi"
-HOMEPAGE="https://github.com/xbmc/imagedecoder.raw"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/libraw-0.19.5[jpeg,lcms]
-	>=media-libs/lcms-2.9
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 49b1a69b61f0..467c56bacb3a 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,10 +1,4 @@
 DIST kodi-inputstream-rtmp-19.0.0.tar.gz 82420 BLAKE2B 9f4d0871e98e94117a7bc335c203ddd85ad7b300729353669b732f710ff175c6a6f5a18c2e100d181eea6c2e369067b5586aa2651b2e928aeaebc5a72d815493 SHA512 8ea7a9fed8ad0d29365a8d0f67c0b0203c16da19607ccc9788e9e244f034b079667d2d1ba2a916fa0ce5af4008563573bbaabce7bface9879c3e1bc1c4c3aed7
-DIST kodi-inputstream-rtmp-3.1.1.tar.gz 75658 BLAKE2B 4a776d3e44326cfa8195ad75b49eecba08d4a6de6a43ea51ee31791556ed2a28536e77033d0c9833838be9a27b2a32dc5ac34c4e9ee92e7a9084b021afbd1100 SHA512 9509fe681c3e2699ebe18a3090bd31c32ccc2634ee0c3c5a686b380ce1d104ff7ec1620f6615495d26fb271164592c0cb4f287ef1852468edddfec9440773a53
-DIST kodi-inputstream-rtmp-3.3.0.tar.gz 76074 BLAKE2B d920235be127d67a73d3fe8b713459f1bc04491577d886352e0932fd13c638e694b322400c5d9512c0716aca7ef4ed5c3535a05472ea6fff5d0d5aeeebe34aeb SHA512 a981ecd904932ba372e7972137c78308f1fe6928286fead13ad692b41aed0303c7e95a1788984e69cad4984d4f36c1d875f98eeb4a0ed3608ca1c4f8335133cd
-DIST kodi-inputstream-rtmp-3.4.0.tar.gz 76100 BLAKE2B 0f087ecdbb13797f094925f37f5ca4c9426cf6c90b803a99bf6b6e05aeb792558e1bdd3bbbc3d3926d8ccc886f3c9ffff7da24f1fb326f7cddaf7d5aa5601cc8 SHA512 5016d5454761bc854e3ccaec375123ae5f96777a1639c68c21b94073aa7b1e7a615204739017704ae03f4119a92afb225152a833f3891e302b95da60904bf39c
 EBUILD kodi-inputstream-rtmp-19.0.0.ebuild 894 BLAKE2B ff5fc3975c57bb40b7f5e17c469d066f5abfa054950e8f86aa1158b813c389747e2bf5713e0b1fc56cc88a89a053cf5d6e5ec06875415e756bbe89d90334e1f7 SHA512 b79b20915136c0cab1f3ead5e6c056345f70951097019bd3f80ee20a0c4b53236829df23968038cb944ac2746cc8b9ffcbe36028ac2a60e290f1c7697deb6ffe
-EBUILD kodi-inputstream-rtmp-3.1.1-r1.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
-EBUILD kodi-inputstream-rtmp-3.3.0.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
-EBUILD kodi-inputstream-rtmp-3.4.0.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
 EBUILD kodi-inputstream-rtmp-9999.ebuild 894 BLAKE2B 2a748a9a0a17bf7b8047256b846064b6ed40cd6d181bd555db50f78f942a4dd605cd1188f1ada43749f9801b851c6d31ac7a0b43a5ebc976e93a8f9ddf5e5187 SHA512 163e2b1e334d40fd67043bd92ddceb5aa9e0520a054672f20c45b9bff0043302cd31e961f1ccdd97aabc4b06c0056552246e3494c7af282a0a1af7d8de6fdbf7
 MISC metadata.xml 365 BLAKE2B 8e50717ddd57ee8895f0f79e21119ca4278b192a8f63bc12a5edd00ab9bb57deafc48bee605b2df3be4a2131a52e88dd1ade4ab54e8307d0ce54b43c61c4b2c8 SHA512 0778bbc55db311a4f017991e7aca80019ad872f058d4f450bad310cf7579fd09f7ba741861c65100d861d3debdc28d4ca7359711a2c1d16cba44c60ecb74f220
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild
deleted file mode 100644
index a0b89342cd1c..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-KODI_PLUGIN_NAME="inputstream.rtmp"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	media-video/rtmpdump[ssl]
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.3.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.3.0.ebuild
deleted file mode 100644
index a0b89342cd1c..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-KODI_PLUGIN_NAME="inputstream.rtmp"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	media-video/rtmpdump[ssl]
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild
deleted file mode 100644
index a0b89342cd1c..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-3.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-KODI_PLUGIN_NAME="inputstream.rtmp"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	media-video/rtmpdump[ssl]
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 6f24f529ad9e..40f895cdf1ce 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-peripheral-joystick-1.7.2.tar.gz 119922 BLAKE2B b4e1c67bb4b473b7907990dc8a9dababdb6c87c69205a91b763a35b3cc381e6f831f505a6fa654bb37cc9939ec3cf83d6c2735a76851f33d8cd9fb38467efbb1 SHA512 d838f44281704e2bc7f3280f05b93347dd2e7a10b8e2b31efdc34b8994723f6aa6ca643fce01f515003caf7d85abbd3eed6a3833e6adf88b9fb22184d2c2e1ae
 DIST kodi-peripheral-joystick-19.0.0.tar.gz 125088 BLAKE2B 3dea375a1939f8520e6f537ba607fb1db68a9283d7954a78cbfb95cfd53b29a4d8c3c7e97469af3753e268a5481d044a9b9b5898c11f9de14d5bece17d815f96 SHA512 edb2582d56a6fee5965e99bf6ceeaf89d7278e767dd3991eba0bbe2be7431c3d53c856727f343db7a7f76aafa36eb5cd947a9136afa0248805f87cd66d751bb4
-EBUILD kodi-peripheral-joystick-1.7.2.ebuild 749 BLAKE2B 2084abfbf10b6f396d51c0c3c68ed7cfb36f93af436f5b4f55e0403a79e82fbac622cb117a1661c9c1638555c0946c4c12b2024d142b07a78c19dc06f3a126cb SHA512 9158682bec1296614b9f51fc5e26fe335e83c6647412f5d10697f07166ca28303ad0663f23719636fc856d1052034eb76d3b48f4f7b59910a8cd0511d52c8fd5
 EBUILD kodi-peripheral-joystick-19.0.0.ebuild 749 BLAKE2B 2084abfbf10b6f396d51c0c3c68ed7cfb36f93af436f5b4f55e0403a79e82fbac622cb117a1661c9c1638555c0946c4c12b2024d142b07a78c19dc06f3a126cb SHA512 9158682bec1296614b9f51fc5e26fe335e83c6647412f5d10697f07166ca28303ad0663f23719636fc856d1052034eb76d3b48f4f7b59910a8cd0511d52c8fd5
 EBUILD kodi-peripheral-joystick-9999.ebuild 750 BLAKE2B 45fd88bbb36d359752f0f92e9cc8dbd7138affc0ae6d14375962b81c61f797d287f9734f2258c5226d2eaaeade4de41bb5c16085ca49cd78edef9fd3b50afa01 SHA512 eaf1f44c31bdb530a716c575acb0ca89f121d5c019dbc7e7283d540b3a1a6e30f4c6bf3933b2d65108c97322fb2aad49486faeef72da0a731c4ce98eaa16d9a2
 MISC metadata.xml 368 BLAKE2B 46a40d27f49eafd117a05fb5d7d359c2624a64d588ebb13a61f3b7fcbd92fdc127e0635ae8520cdb61058e874e75768dce17e82a8e8cf29b5bb49dcbbef1411e SHA512 a5fe6ced278ad471198c567268e38af596fa04a40dfce36ac833d6d6747bb938101f358e86ef0bb36cf9e85f28c4b903feb8074b9d654ba7267fbe02c063cbe5
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.2.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.2.ebuild
deleted file mode 100644
index 0afe32da893f..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.7.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_BRANCH="Matrix"
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/libpcre
-	dev-libs/tinyxml
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/Manifest b/media-plugins/kodi-pvr-argustv/Manifest
index ed37e5f560c7..d3a24235363e 100644
--- a/media-plugins/kodi-pvr-argustv/Manifest
+++ b/media-plugins/kodi-pvr-argustv/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-argustv-6.0.1.tar.gz 153659 BLAKE2B c991b1addcc81e4e07f763b0794f2a4ff998747729d6ea9c8433c9c85872b51c702b0dcdaa92f487ee562fe8d167e54dcbdacb55d8df6ebda5ab6ec6c3b35b10 SHA512 103f17c503c0ef9c0e40c9ad2602bff314bce0b7f7e4dbc1f7eb66082ef5dbf0f55878be012ce4728644ba30a473d6f292c7bdeb3bf72b41928a4c7e528f83e5
-DIST kodi-pvr-argustv-6.0.2.tar.gz 154313 BLAKE2B 54cf2619e1aa3bab0876ac3e5d18e5acbacbf336d8c697cfb5ad1135577e085330b98d89cd25cf551afa44c09acc4433267b799e511e79e8263eb9cfa365fdcb SHA512 dd6b40d274fe2325660865fd9a814baff0a3440d98d076d8636efcd65fbca63972e8ae22f04bd149f2feac1e8334a87c751031fdd1d915089f766e1089590f4e
-DIST kodi-pvr-argustv-7.0.0.tar.gz 154784 BLAKE2B 5a6b604de69e5645814101191d3b79027f7b0aebea0eaf30962c9e70bf5228a99e936a50b36be33671a30b4cd4e2d2d33325b1161f22c738369f2f241c086664 SHA512 8ebe04087a0f0db0efcc111ecab6a8940d23dabd6244c6fca44c05a9fceaec54cbd175fe9bd6d79c6d95c6787c8fc147b76e06b6ce509da6007f3ab0d4bf8840
-DIST kodi-pvr-argustv-7.1.1.tar.gz 156270 BLAKE2B 57436cc9c896a08b2b7b2eff94401530f90bc8bc5b38f24c94b0616e353f97cc2f23973637a95413d12e9459a9e0d4014a38f671d69c9854b3b4d923a9dd7531 SHA512 831fd6d7dba40aef87a9cf6b36bfcda66f53fb36cc8487f741ba33b8cadf87b053ada0cc1b463d46abfa976054eedd5ba7428704ef8d2574a1b23acadfd49f82
 DIST kodi-pvr-argustv-7.1.2.tar.gz 158003 BLAKE2B bf16201bf0f272796aa4e2518ed07113f268b32bf9af857f600b09dc7e86eb00de2a542047fd8742bfb6c523942018816d6130f715dfe2e21d3939debae5f8d5 SHA512 980786c37e1c28e3d8cbe53ef1a9bcdd0dee585bdfe2654154a571d5b9f48b8139f3acc9e3cab06302900ec933f2525875b99ca8ad562ff137a94db875bef59b
-EBUILD kodi-pvr-argustv-6.0.1.ebuild 694 BLAKE2B 1fd8029faa8e1cddf6bdeabb6e9226c43ca3861fd9cfc5ea4909053698b281991ca6fa097a9d5834c0fb5b23755a027984f42f5920a630b1d52d8ebcd644293a SHA512 86ba51038e6265b422ac94fe135da3d7ad95744114210f7afb429866f27cac56efed011d17b1e4c57eda467a86123849887bbbc53a8797996bf59fe2041707e0
-EBUILD kodi-pvr-argustv-6.0.2.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
-EBUILD kodi-pvr-argustv-7.0.0.ebuild 668 BLAKE2B a1303104329b47ec058f717af1c47e4383d9694498000a86e4db6902c73b9748a8abb85975401d6b366062cb915eb1fd98944b61454b7cf46840a13ebb70bda4 SHA512 078bf8ff025c0b4131422726df39a7410ba7f2b86e8741d96a5a3964c2e0fd1c3e6b4b9453a4b4857e4cd228905b3b3328bcaaeb3bd276bc7c137095142da659
-EBUILD kodi-pvr-argustv-7.1.1.ebuild 668 BLAKE2B 027f075f47ef9dc83f9e53861ab037380ab052b66a310c2b08383dce5f116782d375d9607ac352ab0f39d34c9eb9c6f2a7d1a41de9a21f7e6791394404502944 SHA512 8695541454068f484d0766d3873e115111f5e25f03abd59f7362d4e942080d96baa1bc67f5f2d05ebcf5eb686872dd56959d34a01f6842edc7a049d538ebe94a
 EBUILD kodi-pvr-argustv-7.1.2.ebuild 668 BLAKE2B 027f075f47ef9dc83f9e53861ab037380ab052b66a310c2b08383dce5f116782d375d9607ac352ab0f39d34c9eb9c6f2a7d1a41de9a21f7e6791394404502944 SHA512 8695541454068f484d0766d3873e115111f5e25f03abd59f7362d4e942080d96baa1bc67f5f2d05ebcf5eb686872dd56959d34a01f6842edc7a049d538ebe94a
 EBUILD kodi-pvr-argustv-9999.ebuild 669 BLAKE2B 802dd70801dad6deae7a7e0c840b7fa047195f4c32d28ee21c26d213e01002387deb860d3704af690110f93ef204970af2db8a271d7005d43c194846b58eb9e4 SHA512 ce01f62b84b15a9ca39260ec23a25a18b0cb3a8ae165dfa1845e2e24baf1f14df10d98cbd88ed29f31090afb4bddeda27f48374abc1d77851695a4b76afe1534
 MISC metadata.xml 364 BLAKE2B 087576d695fac94f56e4e1b56869671ba91d1912e1d82824b0ff3a8b360f21e090bf18e9688c344e67dcb7381d10fea25a7e493635196117fa0c3d31d8da8f9c SHA512 d9601dd2feb335850e7e01463739cb99d8674da5b16ec4f4acd70100fb4e72781018233f191fd47b8de0dc4232cc59d44c96e0244715de58055b25240e945a95
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
deleted file mode 100644
index d89cc6b5da9a..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
deleted file mode 100644
index 7661c01e1ba4..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-6.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.0.0.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.0.0.ebuild
deleted file mode 100644
index 7661c01e1ba4..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.1.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.1.ebuild
deleted file mode 100644
index 897f6aa64638..000000000000
--- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-7.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's ARGUS TV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.argustv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.argustv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.argustv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-demo/Manifest b/media-plugins/kodi-pvr-demo/Manifest
index 9639bfa5d9da..f099d84f7c56 100644
--- a/media-plugins/kodi-pvr-demo/Manifest
+++ b/media-plugins/kodi-pvr-demo/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-demo-7.1.3.tar.gz 42285 BLAKE2B c2bb67dc47bb85e26bc4cd34d72d272507bb635b1e6f5d14ce57575b6493448bb362a0ac7e0334852b84e9fe4f0f1df611ec9965c11f05dbd91f9b1a93ef7d22 SHA512 faf896f1a531d9bb35c36cd303ec75f66f22030fedc43c1a83a25591d7297e57148bf8adc34d6072370c861b34ee1b9bc037997817cfdd651b069c0057366d2e
 DIST kodi-pvr-demo-7.1.4.tar.gz 47972 BLAKE2B 3950951573c03da2c6a9f599e2c5122fc208004fd4ad4acf88af2760a5502a087aeba2351c938d60aa54981805dafdd3802c7bd58b8eba8028ff205069b93a31 SHA512 7f1468727024cbe627c2e0608e02815877593f23b9592d6caaadf2147dbc48b09f0405db5b67de9277cef362715de68d2099152f5fc9fc137b67bbc34f3a1e87
-EBUILD kodi-pvr-demo-7.1.3.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
 EBUILD kodi-pvr-demo-7.1.4.ebuild 645 BLAKE2B bb4ee9b5989c1950672511adb5483312a274d72772d26b6556fed2f2a968d805e2ac0d7ae02a726cb3e807559f2ab2205c4b10100290a75fd241c8f19fc70bda SHA512 b229363ccf6423298714e9de62288ac990a0f86c3356784e427815ea47210179123d1d9b7d20355d628140440985e18c016de09044d974dbd35d75a34444cd26
 EBUILD kodi-pvr-demo-9999.ebuild 646 BLAKE2B cd1cdad1b6fbd450f79c2e16927f76db90734062b66a185070e42ff06590c404e1736ee42fd42ab10229710c9307b2da5824b7b513434d2e2589cb2102a4cb56 SHA512 98b19d4b466f173b0b14dd3a56c118a6b3d6822a977e8bb922bbdb1314310d55478288082feea641f8280d1758cb3a3d2a680a004e7654f1f383c8fe684afec3
 MISC metadata.xml 367 BLAKE2B a690651c393995a5da7d5a0a94c40b130ef57895b2330c184f0936161a012dbc8b24785e00b696c7b7f21168945251b7c7c243cb56ee5a900590a2066b0e4224 SHA512 11beaf944a52a7dbcb734dd243d679d3f6e9ccbacb8b667149310370017f3996c0a494f7c102ce3059c0488049ca4583629f635d9659533be79b426bac902f36
diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.3.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.3.ebuild
deleted file mode 100644
index cb6e25589b8d..000000000000
--- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-7.1.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Demo PVR for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.demo.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.demo/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.demo-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/Manifest b/media-plugins/kodi-pvr-dvblink/Manifest
index 9381d5fb4c72..f09ee0abd3a4 100644
--- a/media-plugins/kodi-pvr-dvblink/Manifest
+++ b/media-plugins/kodi-pvr-dvblink/Manifest
@@ -1,10 +1,4 @@
-DIST kodi-pvr-dvblink-8.0.0.tar.gz 189779 BLAKE2B f31b91af9c52c8bc8b0d1eba23ce5d204d5b9f65ea71a1ee8251b2ef62a7b7b13b465f9c3ac6e56d78ce02b7b917a473e0da8723d35b6120b3ee1bd91e9c4f46 SHA512 1f5809530be490220b05771f314f7473298f30f733a9624dcd54df489f9325fbc7d6b1ff1ef0e3f78ba2694f6a30654d048690645eb0fecf391580966f7bc9a2
-DIST kodi-pvr-dvblink-9.0.0.tar.gz 189842 BLAKE2B 7637d64b4ef926d03cd0f3102c0d77b382bf3bdce3422bf878c61819a45e257c0818065c6b5e029cbc7aac79eab592f23a7f50b778ca20fbb504c032c3c1ad13 SHA512 16c30659c6edbb977df13486f46539cf397e6770c886118b3e56c7778aee14fee6caf1d2525a3d411c65fea06b6f95074817d563f1ecf2ee2417538b33afab3c
-DIST kodi-pvr-dvblink-9.0.1.tar.gz 196330 BLAKE2B bfc376e0381057358cc97a2cba0f41cdf5cb662adab22b73fb0bd9c00951e5171a88d3755b2291232d54a73ec3c978a47a0c3a476fb6bbc52fd154e362517b0e SHA512 35562d08a5200eaf299d61704361f40ce2c52a8d6453553a8f2acd4e482992a8c71048248edb9994690a3a07df2090dc33d61bae9c7dde87f5f08a9d1ebd8e1b
 DIST kodi-pvr-dvblink-9.1.2.tar.gz 202329 BLAKE2B 4148f776b8ec7a2a0bf2f4952dc9380dcd0531041e1d32354fc600fd6394fdcdd03e2bca983319a53db79d0209f4ae3e10506059bdc429b8fc006f4a6ac30e59 SHA512 c9e5dc24475d3ec358852c213d2f2794fb926cd4fb2edec90c0c90cfba2a0d07f42526bfeb88c12c8c95446fbe7add76b2021f4a7f847a63776044097fc90aba
-EBUILD kodi-pvr-dvblink-8.0.0.ebuild 694 BLAKE2B f9a53b83120983fbe17cd3a63413fdc56e8e24a10575ad56aa1a80c26128582164ae38e9938aa1e52cb9e9d924cf9007b9a75a50d385f873df86ef932f9628d9 SHA512 011b26e23ce9afde90f8e176efcb4cb6a724e5808d47e37561025684f6d0c1535653468aaef2f66b96d8d79ea30f9da3d5f83ec51539bd1f8ab79567dc12b5f6
-EBUILD kodi-pvr-dvblink-9.0.0.ebuild 694 BLAKE2B f9a53b83120983fbe17cd3a63413fdc56e8e24a10575ad56aa1a80c26128582164ae38e9938aa1e52cb9e9d924cf9007b9a75a50d385f873df86ef932f9628d9 SHA512 011b26e23ce9afde90f8e176efcb4cb6a724e5808d47e37561025684f6d0c1535653468aaef2f66b96d8d79ea30f9da3d5f83ec51539bd1f8ab79567dc12b5f6
-EBUILD kodi-pvr-dvblink-9.0.1.ebuild 668 BLAKE2B 6a1d7d319e7cd8e5fab9a59d0ca2cb739d5206b2fc80bd3024507810a00beea13b6df018b52dd0963b902d68bb92d5020c6bd4f9208dd933f9607bc48274facc SHA512 f06ebe631d86d9f6d45227f3edc39cf979ad8af6ca3380ec0b73ce40118334f569cd3e151ee81a1852612d047e8b32beef8a0da62e3bc0d74e8fe89a281201dd
 EBUILD kodi-pvr-dvblink-9.1.2.ebuild 668 BLAKE2B 636ffd63989284268e543771379920312b6957904e83c9b490bc392f67151a052b1ec4df36d5beac680b5fe1804b631a7fd026ebd41edf555e81b7565524b83b SHA512 b714d75871acefe567f33530db7d5f39753212c6a61701a961d8562605e93a5af326900a56d2df92723f59ba9fb38532e43aab88a0ded0d2ecb11e2e2be83004
 EBUILD kodi-pvr-dvblink-9999.ebuild 669 BLAKE2B 72fc7719a7e1b4b5cb89c2fb95ac4c4c05aa70b8c4d3728911487b828034a48c3c570d385cf0e4515b6b13d57e6e5b8a8351a5296030a6824afdded1441ab0ea SHA512 808aedb3b858c2b302d1b9a3c9ed11379f8e9c8911d808ebdebd305e9a9ed1103d00e47f2e9da41480da672989e20aeea10956079395333cad94161c5272dbbd
 MISC metadata.xml 364 BLAKE2B f8405c888578141b7a0c534bac8483ad1c81cee7ece410af1da69098c370358bf7fbebc0406c59612ed546f8a9785f0aa9c7a4af73deb683e4f69885b225ade1 SHA512 8b0b310ae6a0a8738b5c884ec32dfdc116c64c682d9de9ed845a225f04c76dcd04f1a23baec506986428e28e7c6f9236bd4df659804decaaa5a5b1945f7a1d1c
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-8.0.0.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-8.0.0.ebuild
deleted file mode 100644
index b4558dcb6657..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-8.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.0.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.0.ebuild
deleted file mode 100644
index b4558dcb6657..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.1.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.1.ebuild
deleted file mode 100644
index 17d8ff47c378..000000000000
--- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBLink client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvblink.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvblink/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.dvblink-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/Manifest b/media-plugins/kodi-pvr-dvbviewer/Manifest
index e908e96fcee2..aae65e441df9 100644
--- a/media-plugins/kodi-pvr-dvbviewer/Manifest
+++ b/media-plugins/kodi-pvr-dvbviewer/Manifest
@@ -1,16 +1,4 @@
-DIST kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz 137151 BLAKE2B 51eb189d9a2f7a5f36f7efbc542c68b4460e0e23bb829b1dec39d38fdbeab5700078b06fc2b39187f8602e6b59e371e097481238f506069f3deda73bdcdbee57 SHA512 c4bdc8459d6d9b396540397b33d9055779056edbcb226a6d033825f3bb71d31981886813350b943d55247d6d8cade9c7ae0d3b921ceacba312cf9de2944777a5
-DIST kodi-pvr-dvbviewer-6.0.7-Matrix.tar.gz 137278 BLAKE2B 5dd775d9d721a07213f5b33fd3e0391a920342a57cf3b58a13283a2df951a38eed987c23fdc269c7221912a3b4d8f508c11adb0fe467e08dab4ee8c91c115335 SHA512 c74747b3f7c8198f9593e5e9682d431061402bf88cee028aac92089dc64093ae42b4cbca7c610275656a68c08a9330c963a45752cedf109c55cf5170cadbeb07
-DIST kodi-pvr-dvbviewer-7.0.0-Matrix.tar.gz 137286 BLAKE2B 86ec3f7c41e48cf1f47a55fe03dad4e362c7d279dbe11a9a014353fcb1afe67ad56498fd6d5054aa472ced9e8813de78cd89767a6546344caebbb33171661f83 SHA512 c2c43767f8cfaa5a2b50bd807a192ca73e4a52de242a0127e9486d9a9dc02cb5dea9ce4f57601e42f697f2121ce6c7347fd2ace2ea4f1ab834bf9877f1f35cc6
-DIST kodi-pvr-dvbviewer-7.1.0-Matrix.tar.gz 137334 BLAKE2B 138a69d2ff824de1d51968c89d8426508a0d941d0196c93ad5ea488549cfd25654de3bee8ea3d580c863575fce38c431520267f6e0f6fd56a82e69e6a35a0d40 SHA512 4b4d7f195695d22250b09d40a1c071c89fa1be51ab2c0fcf007292d3276b1b3cd19892209474aaa90000f6552339a084368860914ff200ee3907f3f94db75b65
-DIST kodi-pvr-dvbviewer-7.3.1-Matrix.tar.gz 143297 BLAKE2B 937e4b6771a4a4248c4869f259ba77887ecff48ced59fb4c9258168b4b8c3798401c3452a3bfc75e130d969c1472998e871d54492ae8ae4879c44fb515c81ee8 SHA512 ce81ab7712e7e428eac8569fa866afb69401046d93f096331ad491ca71ee2f56064824719d994dfe1c28d3c9e29282d17a757b9c8e003e5ca7083b617e26c223
-DIST kodi-pvr-dvbviewer-7.3.2-Matrix.tar.gz 144213 BLAKE2B f17b9562d151411d57b1d236d4e7341e10e59be1ed3252d847e6b4d181967452ea5bc9e99b16a8ff7fa642f2d1def1521768373fd3b98e9482d9359c7223c6f8 SHA512 63c1a4994ca1bce99967950b75b3d1d8fd3aee643152cf15611e3b41cd159c5c5e255c4cfdee4c28abedc74c04c441fe7104040bc140eeb322289520c078c00b
 DIST kodi-pvr-dvbviewer-7.3.3-Matrix.tar.gz 144323 BLAKE2B a1e2f537b659f4530cf6693195ad56d4ee74a11e5d598461b9c6d4d1542ddbdb090b00f5d9b80a88a988779e57cea89483bdbcae024d979d7ab08d1039483a0e SHA512 ec87de4800790ca6d67541335eac32472b3c4417d6e906d4f2fa6864389b2f7dcb114ffc5c1281e1047b8f7a819d4072725fc24f72a63b29181e9851b782b547
-EBUILD kodi-pvr-dvbviewer-6.0.6.ebuild 715 BLAKE2B a62dc022e091e40897750608e163cde3d1a008d1f546305d4b9390083fefe6bc069b7e1b1a6f3ce0a3324b9a0713c717e9db04c750177c4ffc9166e3b908de4e SHA512 7bc858a9057e624a5023b5d08b2a08e5c05f970003574f0d4c9acbb66fff3033e98bf69e25ca8b1acb199bcd664ec6bd2a94b7c96617024b95edbc1370e162c8
-EBUILD kodi-pvr-dvbviewer-6.0.7.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
-EBUILD kodi-pvr-dvbviewer-7.0.0.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
-EBUILD kodi-pvr-dvbviewer-7.1.0.ebuild 689 BLAKE2B 6c2aca99b98713ca4c822ec1f45b94a7dd5c40fe6b10f5199806d54c9715ee9eceba7282f1da3da6aaaadc5b167bfddb2d544202860cd6327b2255ea5dcfe03f SHA512 2744de0efee148f91ea4a4e3719ecfa30b5bd0329e83279fde854a3e2aa5fd27f4087476c8bcad432f495eb663e7c42a8982e71402170980d8da6cefef1da969
-EBUILD kodi-pvr-dvbviewer-7.3.1.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
-EBUILD kodi-pvr-dvbviewer-7.3.2.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
 EBUILD kodi-pvr-dvbviewer-7.3.3.ebuild 689 BLAKE2B dba762de709a360425dc50c7bcd47a065c4eb547e7a99515f47e0939b4e168c4ab347b430f9fffe501e81c74f4fea3d1eccb2ac10bb5583b0c679708286eefe7 SHA512 23e819ad23cea55dd262828b0fdce905bed30c22d96fd70bcf707ef63ff209ecaf8055e472cf3e18f5e445b69803a518fe6c06385f52ec7684fe8a36a6d74a1a
 EBUILD kodi-pvr-dvbviewer-9999.ebuild 690 BLAKE2B 7b2c27e9088e2e5bb13ba17ce11cdafbd0ee43258b5edbd1f0fea33ec60d162ee40d4cf1cbc8b064ee989455cae2c7da2dd42749e6cdcf2bfb23c045bf14e066 SHA512 66b42c5dbc7fa9f1b94eb4a8d57af8b86c3e77f1339384e2e02ef2d83507b9b521c6c226a33ca3b11e0306ef073f226098442abb57e7ce701fd320ce2d76d85a
 MISC metadata.xml 366 BLAKE2B 5d37865a727c6cd9ba676ecf51677d4839f40ea48f46ad0825c7f4cc760a4d4739cd6c52cecfa7785f95e9a1522e722b3be34f5eedff489067a85460b0877359 SHA512 624c6f5808f2661fdda46c78907ff599ee60f319de3f08ab2ab42a7f147a98120ae8b0162a2093f44f02bcdd383cf6ba539f3f378e67e17ebc178a6b8e592dca
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
deleted file mode 100644
index 54f5e15ff029..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.7.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.7.ebuild
deleted file mode 100644
index 6c015a0ae550..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-6.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.0.0.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.0.0.ebuild
deleted file mode 100644
index 6c015a0ae550..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.1.0.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.1.0.ebuild
deleted file mode 100644
index 6c015a0ae550..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.1.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.1.ebuild
deleted file mode 100644
index e9950f3e4f38..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild
deleted file mode 100644
index e9950f3e4f38..000000000000
--- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-7.3.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's DVBViewer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.dvbviewer.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
-	S="${WORKDIR}/pvr.dvbviewer-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/Manifest b/media-plugins/kodi-pvr-filmon/Manifest
index b6dbc6f7a4d1..11ed2f11beaa 100644
--- a/media-plugins/kodi-pvr-filmon/Manifest
+++ b/media-plugins/kodi-pvr-filmon/Manifest
@@ -1,10 +1,4 @@
-DIST kodi-pvr-filmon-5.1.0.tar.gz 111224 BLAKE2B 8c65a7ed7bcd1846c0bf64ccf99111d8fdbd882a06a6045577d031fa68730ade691362f8b60105714e5ebe7f57e31d1e76927b1b505926b4fd7f3e99efc24983 SHA512 02ba24e23c44ae3000c4f41e90169ea1455678927c6de1fda1927c705bbb236ed06bd5ecd0da59f547f02afe7b695306f7282cdc5014816fd9e0f1922243b2fd
-DIST kodi-pvr-filmon-6.0.0.tar.gz 108084 BLAKE2B a30f73569fdea28d9c4beca1e605099e9ee4bdfc61c9c56e7c5089d26857cd67785bff0b7ac81916379d8ec825e2f1c1f870a9351bd49d24f35e7274777596ec SHA512 c86f649a12fca13ba5aabcd3c4c37a75279646fd093f48aa20ed3d6a75ad1de0980daffd3aac4771581628974515351c8f9618f60b4b5ea6b66ad91ea6ba0f6d
-DIST kodi-pvr-filmon-6.1.1.tar.gz 109741 BLAKE2B bb5bae3f97e6722f501c3ed5f8873787568ec5397306580d46c2ba68847315fc07ba2156a789ad6f9d7a35edd4e05f7399389db6833800ed3f49a7a9c966d388 SHA512 435bdb66092a7c48093915bb4a70ad6fb266f6706d130d1be31e272b12ae1bedf0f42b57fa81385cbeec0f948b8a3664fc1a4ea590f5c179e74266a506f08631
 DIST kodi-pvr-filmon-6.1.2.tar.gz 111152 BLAKE2B 43a8dc37b45cff82b9bd753d95595a61901df03a9e7ddc8c028dee3192693609a1d6c6803969bc5186817779c55819f90b002aaea2c4e99026cbe216341cdce2 SHA512 96f767e55c0d2f9784886c2f3a2e8500e007060898cbf6d448b676c89723759da5172b185e9a5e34c21975379cc103cc3d6a95ba6b51b39af0c2a6333406a0b6
-EBUILD kodi-pvr-filmon-5.1.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
-EBUILD kodi-pvr-filmon-6.0.0.ebuild 662 BLAKE2B 7866d82a74f4c3636f63ef889ccc87abb2ef325002b5313fa2c5f28ab3ef80e544747c0ce9add7386ac39bee3ed34cad22d68da2ba28464a5bddf7488f945ded SHA512 32a94940509cdb8523bbf0ab6013b37dcb9ef18b865ab3b82b005f7eea88a64804f457092d8a69f0c94fc7e4caf64f0f626c518bce690ee01f4369d7a598f7d3
-EBUILD kodi-pvr-filmon-6.1.1.ebuild 662 BLAKE2B cc7cbf9fafc1c4981edf531aaae78e759006e91d27a5439278d8732152232f457e86215a5ac7346189c98abce22cb85dfbb3013777199bbcb5b6eec6f783dc68 SHA512 3b1f3ee7291cf288955af5490a4b2a5d907e4557cb697eb0f09314147e88ab2596a442dfb28c82bc34d6c93f5fd25b483f3635199bf1db3e7e4d1205ffe996c1
 EBUILD kodi-pvr-filmon-6.1.2.ebuild 662 BLAKE2B cc7cbf9fafc1c4981edf531aaae78e759006e91d27a5439278d8732152232f457e86215a5ac7346189c98abce22cb85dfbb3013777199bbcb5b6eec6f783dc68 SHA512 3b1f3ee7291cf288955af5490a4b2a5d907e4557cb697eb0f09314147e88ab2596a442dfb28c82bc34d6c93f5fd25b483f3635199bf1db3e7e4d1205ffe996c1
 EBUILD kodi-pvr-filmon-9999.ebuild 663 BLAKE2B 4b2f64e7ad0b13994ae98e611346d88b3b24255e8d4ffe3dd9eda35b553b9de85c78538855df31ad6d7bea05660251a1f53eb603d87a5e3039a0a3b24230cd5b SHA512 8aa1ccd46a6af7fcb08e54e833652f5e6747a0c223f450fd8a6ecad4918a84082d7d32fe4686a2d1829ff1ea75757928898fc61e653b3d434a18f47cf663462a
 MISC metadata.xml 363 BLAKE2B 8d769c5f1dae59bd987c10736545c53712f01bf6c5da2a208b9e77587cd4bc77db9434e677b5f89c3dec55da29003fbd88841e6aeb9f138847939757aee758b9 SHA512 43e93b8d61a6fc8ee81c48ef8529044033637e789e9696f7455eae008d76f18ffb6d963c4dfaa95bfc35d66c04636f2344a65c970f5bd2b693d22073a769eb72
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild
deleted file mode 100644
index 6c7b60670368..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-5.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.0.0.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.0.0.ebuild
deleted file mode 100644
index 6c7b60670368..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.1.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.1.ebuild
deleted file mode 100644
index cbcac25ff490..000000000000
--- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-6.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Filmon client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.filmon.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.filmon/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.filmon-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index fb997c79fb6e..ee419930f16f 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,14 +1,4 @@
-DIST kodi-pvr-hts-8.3.0.tar.gz 181974 BLAKE2B d86bea7a037ea0abf4a2e6e9b45fb7c69f03d4f29f7b97f9ed0367bee3d243e09fb1b3998c437e9103672de4bd8fa7422f5c89ac35e87c5ebccf730f3d2a3c71 SHA512 4c49e5351608da49317e4916e8f60d88df0f9f907ce0cae026708e758f6937e33ab25dcb82351986dc3f3b8d73f40222db38bdb3db046c8b67b0c17ef7892abf
-DIST kodi-pvr-hts-8.3.1.tar.gz 190434 BLAKE2B d1a2d17e94e02ec37d0598c5d550859db46214bb0acc20034b809386935301499cba53bae8db8668099d82deab986983f3952cc879a4160ae1bf1b992c347b6d SHA512 adbc77518f45d0c745edb8c1c687b4a3165b8d96f62f5a923b327f0ad89a52a7f1d45ad4541ac1dd9bc8f22b2537c018d977db4e0e8ee6fa3c9495bd36eb7fc3
-DIST kodi-pvr-hts-8.3.2.tar.gz 190508 BLAKE2B b48ba46bc640d23ea7157c7a4c013879e201a30d8c45849cdbfa33e4d52bd9508761d241f67db980fb9c518aa9921781907329f3ef3f1388cd8321bd49eb0bf5 SHA512 5ff3791c0413cc6a3ddfece9da1296611dc2bd8fd726260ded391f04f2a259a7ead756f7a069c1a5d3e2d9249e03b767b0553a2a71d297adea8644ee27f1fa7e
-DIST kodi-pvr-hts-8.3.3.tar.gz 190712 BLAKE2B 3c3470eacda0df7f5dbb014597b9a492a1b926aeaaf48febb439cc253b096feec416e5ddd4c29b521c7e8389e80f274dc507912862563ed0254db03f121d50af SHA512 30d3baeb6c970a14b965f09f572d35f9d3a1339dfa624610045ad8d7dccb65d7eced665227fccda6c12801745e08ceb90ad73f2829540d49854af62757ecc5d1
-DIST kodi-pvr-hts-8.3.4.tar.gz 190740 BLAKE2B 10dd05d406b6e6b9a2608f0d9347997d9c939ba5ac937eb03d49ca8a9200dae6fee4f50c787a0004739218c35b95f14f2085a604183fd83869d886f5662f20ff SHA512 f7aadb37de471b57267984ca92484fab0736cf38db2f437dabad63ecbfd56b61f51fce077389d667eecab4f7445bfa458fe1ab8933607a81d1d69f3448810934
 DIST kodi-pvr-hts-8.4.0.tar.gz 214128 BLAKE2B b69589c2bb92cf5f77b6c5a35afa37b8995388179ab316c3c84baa20a79dc86cef89b99bf2afbc5e8f89f7f85e261c83eeca2b92e94b62a5f8de41da4bd64ea6 SHA512 929d32e0702b7199cf2e80a7bd7b0ec6654194fbd17f15defa11da7aa41e068bf999cad25ebb7dcb594e5895354824483b4a4e896cc97a7b06b9183d21c0fbff
-EBUILD kodi-pvr-hts-8.3.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
-EBUILD kodi-pvr-hts-8.3.1.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
-EBUILD kodi-pvr-hts-8.3.2.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
-EBUILD kodi-pvr-hts-8.3.3.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
-EBUILD kodi-pvr-hts-8.3.4.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-8.4.0.ebuild 660 BLAKE2B af6290e032f043698bd3f20363d418c6ac0ae79f254ce14925c65679ccef0940031bb8cd02bdbea18078e65d5fe2a7791dc9538aca70fa85dc05bb6385a50e3f SHA512 06a5ae4506d08d097b6628251db215d97609a29fbeefb036c9fc8e90c7235ad73a2cd45fab204a601d8e72b4aff9f0c0f7205ea4a7997ec299b68745ba862088
 EBUILD kodi-pvr-hts-9999.ebuild 661 BLAKE2B 2e17ace5bb95016788db8c07b1d0aef10f72c5bf82f7c0321d27525550a382a565df112d4a5125233ae029dc294962da333d1f384a46bedd643d81e1c1a65fa0 SHA512 f6122a34e52426853d476eedfa33209d9435e02c79ae75520e6c64ae36a5cb663ee9140c96d53f2e7437c20135776ab8071c1a2de6cf73841c0cf3adc8bd10da
 MISC metadata.xml 440 BLAKE2B 2322fdb90bbe5da257f88f99c42ee1c13af46c7f51880702ff590ca852081c33bf7b27c70dd07fbf414844b2d206d29d520b8f2971b4538dfc70ccfe6bb8419d SHA512 c8ac717c0493ee1f25b29b7a3e4a6402fcafad8561ca2abdef2a36bf5cd1bd67c96089ddb229aff0f62f668f7f7cd30ffe72498938aad722380e43733aeef6a7
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.0.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.0.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.2.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.2.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.4.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.4.ebuild
deleted file mode 100644
index 2229139c850a..000000000000
--- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-8.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
-SRC_URI=""
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
-	inherit git-r3
-else
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-iptvsimple/Manifest b/media-plugins/kodi-pvr-iptvsimple/Manifest
index 6b992357491b..b98c6b207ce7 100644
--- a/media-plugins/kodi-pvr-iptvsimple/Manifest
+++ b/media-plugins/kodi-pvr-iptvsimple/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-iptvsimple-7.6.5.tar.gz 192388 BLAKE2B 596622b1058c392656dc27fd0a1b615f9fe1ce12695adc4e26aa5417e5250d6f18fcc3cafaab4d6c53d00c44fb57821fdc976b4efe369e24a3997921606dbeef SHA512 ef16b71cb1adf6d68e74935a12d5ecb8c52c732f5a69e0765558107f356686c83427356bbef3227b6744ea314ef2f1e6c2548ecb1f90a38a521d351048fac43a
-DIST kodi-pvr-iptvsimple-7.6.6.tar.gz 282395 BLAKE2B cdb3a98f9e727aad872f91a9f8784a797c0a87f6ce05ec0a21630b3912fc8a5b6548b94fcff58c35c62618c00bcedb8abcf45b7073afcd35dfde576034e75617 SHA512 7a927bed2e2121f3949a706cbd0f8085462f66dc8cfe3bfd686364cb8412f7feec53440054839ea2b6ac8bc124a15875112aff906c04c86d5867194e42875c30
-DIST kodi-pvr-iptvsimple-7.6.7.tar.gz 283836 BLAKE2B ac9a49ce09dfb02c5f69c57bbcfe2112fe7c68610e702c1690bf07398d53954512650294eb34d82cc3da037b6925beda4bb226ae55526c1a5837a97631b6e0e7 SHA512 ba9d70da83cb503f30027b2d57941f84a13b335596d085cc59a1dc61ce05e08735c6dd260fc17ac9175035a5928f211d045a8da462e323f6e9d7ed852eeede95
-DIST kodi-pvr-iptvsimple-7.6.8.tar.gz 288131 BLAKE2B db77ea4e2f374a714041a4bdc8d8a49458b05c3ee40a989039ed0087a6872c167da2fd56aea7e284290a1a0cb84a46e3e714e4bd803c6b3167c4741f3f99ae68 SHA512 19d884b1497e64bffae10e380b4536651c31d567d2857b665098aa576766f26c035be0e5ba3398cac04d376389e972530a795ae91b533fc87ea97e3f35532d27
 DIST kodi-pvr-iptvsimple-7.6.9.tar.gz 288485 BLAKE2B 35c752b0f7ed10d8f6b452d074c576554d3e49a67e56076af1c2cb31037a02f9ca7b7cc86815c30c3aff17b2ce8b33eca1f0848b353f3cf30b51b6e288458183 SHA512 72316d784410284b2c53dc259b22498e871ea8d82c0b91a744ad100a5c511cf0dffef9952a6bca33adfe129d7f88a4cbae74659a8b1fa4037083283d2916f699
-EBUILD kodi-pvr-iptvsimple-7.6.5.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
-EBUILD kodi-pvr-iptvsimple-7.6.6.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
-EBUILD kodi-pvr-iptvsimple-7.6.7.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
-EBUILD kodi-pvr-iptvsimple-7.6.8.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-7.6.9.ebuild 776 BLAKE2B 3f732410c2799908207212bcc3db44a769c448e56d02d9ef965fca8e9fec915e467e4ed29a9402ef85feca32d9c9632646bef71766738f368ce3d6dbd7c8c88f SHA512 80c6d16b413c8d87cb15eca37e5d9f6a7d211f72f50e4c7ecfbab1e66c293bacc89550cbdc5c510776bf5c2669b6d9900d0e09174fba2df5bbdbccab912a0ad9
 EBUILD kodi-pvr-iptvsimple-9999.ebuild 777 BLAKE2B 1f18d43d3ce74c2dffbba99b6ad31c572d5fc5235409ddfb864abc8b2dcb3e5c1b584d7c58fd34b6aee45503198361c5b0b1d90b3946be18ac7cc9429330c214 SHA512 98b61705920ca7daf65b16c5c38e10f7e0a832e2b91c8eee0a513f2f459591ddfdd59a4146eca101630a7ccf863218c8d5e593a4704ffa70eccb4c7133679328
 MISC metadata.xml 367 BLAKE2B a690651c393995a5da7d5a0a94c40b130ef57895b2330c184f0936161a012dbc8b24785e00b696c7b7f21168945251b7c7c243cb56ee5a900590a2066b0e4224 SHA512 11beaf944a52a7dbcb734dd243d679d3f6e9ccbacb8b667149310370017f3996c0a494f7c102ce3059c0488049ca4583629f635d9659533be79b426bac902f36
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.5.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.5.ebuild
deleted file mode 100644
index 36d5b715c65a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.6.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.6.ebuild
deleted file mode 100644
index 36d5b715c65a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.7.ebuild
deleted file mode 100644
index 36d5b715c65a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild
deleted file mode 100644
index 36d5b715c65a..000000000000
--- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-7.6.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's IPTVSimple client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.iptvsimple.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.iptvsimple-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/pugixml
-	=media-tv/kodi-19*
-	sys-libs/zlib
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
index e670b877bff8..2c03c172a9d2 100644
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
+++ b/media-plugins/kodi-pvr-mediaportal-tvserver/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-mediaportal-tvserver-8.2.0.tar.gz 405092 BLAKE2B ae20d4dc06ed8b6ffa1487c932f8938267b3bed4ff28c42a6721de5bf416aa3a2517658fc8044369b83895f0c0c0774b25a57c24fc324cd06d4bebe453b3caa6 SHA512 43c13cc131a66195d8afff9214ebdc21ae6b69011e6695c2f57ee86efba3bb50032728eb118c2f8b0124dc3a8bceb00dd68320a6b03330c3054bc3de89194a5e
 DIST kodi-pvr-mediaportal-tvserver-8.2.1.tar.gz 411048 BLAKE2B 803b47e42d7b7e777293f2d777a7bddbc2b0400b7bd43d5b441829276e6a7512cc3d30a2949a3d4703da7282804e536e2420a1f40cb05dc6143bdee931adaebe SHA512 d257992bf77a49bf9b130bf91764b2c174bae955c8fcc3e487bc65c5f963963e10e15855019e9dcf3c9e8ed2fa3e7db874e7282cd269d313cc15c664f88c9ad1
-EBUILD kodi-pvr-mediaportal-tvserver-8.2.0.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 EBUILD kodi-pvr-mediaportal-tvserver-8.2.1.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 EBUILD kodi-pvr-mediaportal-tvserver-9999.ebuild 772 BLAKE2B 633152a7656f906a0c0dca4793704a7a456ca373a196774464ab4070ff8e6912fde4b55ff1ae32459e50c39c8427109b4aee4114edc7d71c3033588f661dff94 SHA512 6d6e368dfce0855d37466de324597ba571d4d797e96443904f859575ffa4714665ef2a9ccb4a1b0f972bbf2c93c1de66dfc8b5114ca0344af49ed9cfb798911e
 MISC metadata.xml 377 BLAKE2B 2cf4aaac41e837a5f9a0c8e461875d5860bf5b31b7c0148220cc4ac7a13637d968ec15e2beb4a931e90f0d6e8ce93bae9cb31e535e79509c5e5157f583ac20e3 SHA512 d68bd31f0358994935fd2bf53c003f4e34e4654cea4c96f24423f1eae23faa94aaba1fcc3a069be20b4bfe42a6acc5fc2259fd9e80dae22d410b2af6605adbf2
diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.0.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.0.ebuild
deleted file mode 100644
index 1de2f204415a..000000000000
--- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-8.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's MediaPortal TVServer client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index aa51e15ae0fa..eb831df42144 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,10 +1,4 @@
-DIST kodi-pvr-nextpvr-8.2.3.tar.gz 150375 BLAKE2B 56493c4f7cb1a42c5b792934ffe5495b8c8083fb12a262a96f47fcadab53a1acbb3c614bb3c507980860bf2cc0c54be374207bdeaf9bb6478991c299c960081a SHA512 6a0bc9e170726246fb46e6fee6c829c36afd570be98ae53901da7fd8a72c319887d8a179dc9b227b8ef0b1628767b7257ef650bc127598d1e1337328c2aa4842
-DIST kodi-pvr-nextpvr-8.2.4.tar.gz 158037 BLAKE2B 7696679bc7f4d667df95e674e48d1616aba2588f4e1ed5e5d388520369c9ab16e75748203a18d5f85df4cbb1f1cb7eb8371fd2717bce79ef12edd82b0028ad6d SHA512 e256eb268afeed810e7fe94194762a3f22ba7f24bccb06a4ac137170864d96daae00094fd185354d88baedba34dd54e15c935f4dca6b268b0c74b1e9415ddeeb
-DIST kodi-pvr-nextpvr-8.2.5.tar.gz 158146 BLAKE2B 2e6060b151b0e16decbab39762facdb7d05ddc8c8d1288894ba53e28d6ebd484799399793482dbd2e7adf1db10b0ad89dc1169a528e5ed362e3835942bcedd8e SHA512 7ff620339c03a7519d2ea01be66a18df7a800ddc7e997fef2826d956565e67b8e5ce95d959409b7a476df39947a0b430de91d7e34d8163718cba0f9f3fd7ed24
 DIST kodi-pvr-nextpvr-8.2.6.tar.gz 159496 BLAKE2B 1e09869b04e5f69279c33138bdf466db7f00e92945437d86d5a61f57a41cd3939ecba50404da844778ea92a8dca322c4cd520c045c6ccf10809cf64acc61eafd SHA512 dbd666b96982223d5f8ef546e3dbbb42390e13109aa0c4a93222e1668171001391136b952d986d30ce8742394b502f7b41d8fef3ca2967bd1cf4bff5daebb1f8
-EBUILD kodi-pvr-nextpvr-8.2.3.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
-EBUILD kodi-pvr-nextpvr-8.2.4.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
-EBUILD kodi-pvr-nextpvr-8.2.5.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-8.2.6.ebuild 668 BLAKE2B b37563bb5faa6c67c518869eb57534793b0dcdc8c9e9a87015fa900134b73c589a8c1256a9eaca5c98ffa2e73713f41931ab674ce4a9e108929f2a3edde8b61c SHA512 5870d672c0d7f2edc34078f5b7372e2beac1cda9b2e54d347e615209f6f0b600da4c2031931e1c881d8081a756a70e2b404ff35a575756ce7e873e0e55f82102
 EBUILD kodi-pvr-nextpvr-9999.ebuild 669 BLAKE2B 2df674d0426fa7f3195e7ec54e507955811e2dd2d0d0ed70d2d7d61b43e466b15fa0a5539905f88b07159a3eb220e205c95daca2f42b0ed386ca4e2899f083cb SHA512 e25dda696230ab5f661277943e9265c4efb37091beabce465460893765f4758b6f5a72f88e9697c9bdfe6014f0638599db1c59226b9672dc387d9da1734992e1
 MISC metadata.xml 364 BLAKE2B 5791ed7a8c4739e912dd17b3f3c781db79eca3bd5c3fe83d834616fec1e05609b39d96219a4bf95c42d5a2622accdec5d0b97f0fac369c093703c1bbab175dbe SHA512 642e88a077105e6989c7b77ac73c692e4160177ebd4c067f674ddd368fb40fb778ecbc05815479801e48d766bb23ec11006cf5f74a2b0d6273e47e5038145386
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.3.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.3.ebuild
deleted file mode 100644
index f1d5484de0ab..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.4.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.4.ebuild
deleted file mode 100644
index f1d5484de0ab..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.5.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.5.ebuild
deleted file mode 100644
index f1d5484de0ab..000000000000
--- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-8.2.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's NextPVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/Manifest b/media-plugins/kodi-pvr-njoy/Manifest
index 8e3c8f35d313..37defb031606 100644
--- a/media-plugins/kodi-pvr-njoy/Manifest
+++ b/media-plugins/kodi-pvr-njoy/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-pvr-njoy-6.0.0.tar.gz 54587 BLAKE2B 94d499840f91a1ffc57fbd3d364df1810eb82807532c8a95d66a8a2cd3e3da6c6177a01ae97ff5936aa9b35fa4ab6e1b8ed56691fe32213031f433691090cbc2 SHA512 3279226b3aef3511d7fc5c0cd73f6bb943321f8ee903a1f3736e707488c6ea7e14ab930ef54b22548a87f8daa6e19fc33f7f86d62e4b7ac53ad7eb4dfe526fd1
-DIST kodi-pvr-njoy-7.0.0.tar.gz 54987 BLAKE2B c43498d3c29aed4d785373e56180fbc2be225e37be73c6c8a2ae7e40db27f7060aeb5dd3f98a38aaac1b3f098ce5ae2d27bd5a4a1edd4d512f5be78780323586 SHA512 a69757cd1d236ef0bf2624fe8f20485536a23d3c62f1c859f20a0f776a9353726e5fd53b3eed852ad0edc8f502d2aceabdcd6c74141504015948dd7d101a5ee1
 DIST kodi-pvr-njoy-7.1.1.tar.gz 56749 BLAKE2B f1849e2b114dd873c78ae48b25223f28a45b5ca46ef7a244ddecab9ec0a33de31c22b1709ee698161052de9104c023b448e196259f02d2c98a02d44f25aaa0cd SHA512 fceeda6d4f967f250ffbb5dc2a4d0cd9248cf61447ccbeb6152f5812186fcca2d41222038ffd53f7d7361ca06fe92599d7eb44d0850e03e9605d33e89086a201
-EBUILD kodi-pvr-njoy-6.0.0.ebuild 655 BLAKE2B d51d50533f4892bf7d9f75f473c10ea0a1526636c650171e2bfcec676bc34f8061cfbe961ae9576ab6987b4d950d1d2bcb06045999810f5a4e06cee37a735f45 SHA512 6c66fdd69d5e7cb0a3d8c586bcec60b920626dc1a87c97d0bed03fb40c99efdda93f42cf08f0adeba13447db9676c84b28c3fe41092063157f515689b2fbbafe
-EBUILD kodi-pvr-njoy-7.0.0.ebuild 655 BLAKE2B d51d50533f4892bf7d9f75f473c10ea0a1526636c650171e2bfcec676bc34f8061cfbe961ae9576ab6987b4d950d1d2bcb06045999810f5a4e06cee37a735f45 SHA512 6c66fdd69d5e7cb0a3d8c586bcec60b920626dc1a87c97d0bed03fb40c99efdda93f42cf08f0adeba13447db9676c84b28c3fe41092063157f515689b2fbbafe
 EBUILD kodi-pvr-njoy-7.1.1.ebuild 655 BLAKE2B 783b4ad02382b83fb4999b60833efa4e1b31c051843c018c6fe35e6ef68d8b6443c3b1b188bf2647ecb17824ec02f90cc3c6faab832cd2cb8e43cff8267fb397 SHA512 7797ee020c1880278ba15ad8eb29605b43d1661780c197e2906d8708c40d0945e475c760b544ace9a1a225aff6c543db48e24e15fcb052832136b6ec5e4b6a7a
 EBUILD kodi-pvr-njoy-9999.ebuild 656 BLAKE2B d408f7bfb0a2b90b1a840ead5402b3da96157c6b6b6fb45d574e2b4b11f466fa378eaa8eeb6aeb1d9bd9aa0e98ecaed65d7de521ac39d3d38da1cd42e98da4e4 SHA512 d30ee6601c254b39b02c37fafb420ae2731227f51ab6a8cd0349f52c8906949b41ed57155e373901e4048c4e1adbeffde5500f557d4a891781cd87ee07d94b85
 MISC metadata.xml 361 BLAKE2B 1eb4547cdd9de4c7b79c7cc944f056d5209879f55e556a72e618877489fce0092538448e09beb8925f812f2a96116271d562e851c13400c73fe8ce6ae92ab295 SHA512 dd460018f5c02cb318e47c7e4a67e58c5cb85441f7a595e76088bad0785ee49e012c6d2b42a9aa02dd7323981c5609d33e4c2714fd7ef5c5dfae6a00df237286
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
deleted file mode 100644
index 264ca39f933a..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.0.0.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.0.0.ebuild
deleted file mode 100644
index 264ca39f933a..000000000000
--- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-7.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Njoy N7 client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.njoy.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.njoy/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.njoy-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/Manifest b/media-plugins/kodi-pvr-pctv/Manifest
index 2489d5b66ca2..b313618f2e04 100644
--- a/media-plugins/kodi-pvr-pctv/Manifest
+++ b/media-plugins/kodi-pvr-pctv/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-pvr-pctv-5.0.0.tar.gz 65924 BLAKE2B cf2a526359457d057c32fd0ec726e59fa64010b51f1cb48841c387f38834433062487c1c12ae83aed9e653a639a4d6329145ee07f21972b0d452d5f9f9919189 SHA512 88addbfea0d39384ccb8818e88984e8eb55f9214f350285a6fa42de18045611c0cf98937e252fcd787b473fddcee0f2b3760262d901fc4b158aa4b416332b795
-DIST kodi-pvr-pctv-6.0.0.tar.gz 65852 BLAKE2B d0bf91ebea7a2d01fb87a79deaad8edd5bfed8be71e723df11fec4b2186f5d9785dab023e67e2290b958adb245446a3b448b0f1498026ec15de6637c7778ca31 SHA512 33bb46f872832835a16fdcc25bec8a67cf800e80c22bf59241e5eaddc3f7d6fedd9a60155b49b6b21c2c3a478cd5f4be503a120c04cf566fd8329ca08df2b0f0
 DIST kodi-pvr-pctv-6.1.1.tar.gz 67214 BLAKE2B 468382cf62dc9c54b01a7ccce25ec73afc5bb405285adc561fc44125f9b57ec3702d6d3dad4a9fafb50ec9ae58974d1b6ae95347913abb7b67e3ad72d31ef1b7 SHA512 12fa2d9299ed84ec89cf4f159946cb007a9a7d404d68a72eb5b63711b4ade6af054107d4880f81d8b3b6683f02aa2495b9c3fbf5d1f5e3d0aa7b8a3316b028ed
-EBUILD kodi-pvr-pctv-5.0.0.ebuild 652 BLAKE2B 9312b0e48638475e6cb2cee4257afac0d4e0f2342987f52f9876cb9376ef182ea87e635ef6c1bf9dbe543e1a6860bbd189932ea315651b7617e6218bf7b461c2 SHA512 d03c811c7be9209db2f1eb6e0990675381951a40401fb137f9569ef5b3e039af5ee62a7220da4b3a72a9bad5e0ca2aeda7cf56977c5ac063af90cae06a26422f
-EBUILD kodi-pvr-pctv-6.0.0.ebuild 652 BLAKE2B 9312b0e48638475e6cb2cee4257afac0d4e0f2342987f52f9876cb9376ef182ea87e635ef6c1bf9dbe543e1a6860bbd189932ea315651b7617e6218bf7b461c2 SHA512 d03c811c7be9209db2f1eb6e0990675381951a40401fb137f9569ef5b3e039af5ee62a7220da4b3a72a9bad5e0ca2aeda7cf56977c5ac063af90cae06a26422f
 EBUILD kodi-pvr-pctv-6.1.1.ebuild 652 BLAKE2B 74cf66388639099ea69e7928d4efd06297db22be583fa35d0feca9fab0c74ac77a05789072cf1d1656e433ea9b0788684c3b5002857a407b04ca760bdac3eb92 SHA512 61460a66854fcf58594610edb5e20d6ffdf2268583ed217106f58320c2762e86f5fcb3490d1d4b819281c05efc19b99944481331aa9488a49bd32d6d9674c233
 EBUILD kodi-pvr-pctv-9999.ebuild 653 BLAKE2B 94014b007543d55e5e419af01d1b1a28792a5fb01728cdb02cdf5256e7ca9b565104817eca6fefc86488b441da97763212f310f5684bee052b8d79c5bfa9dece SHA512 94f34ce270a89ec35993f5949bfccaf200a8b4f7ad3599ac6dd359ab5d4458eae81c371d42fd6005c1273355341490733a3c10c44e93b0bf0944511adffbcbcc
 MISC metadata.xml 361 BLAKE2B 339f321cde77e597a54ee20238e2d5cb8d8b33a1f37642a4b9f77a9e60612c6da07a7685460ef283b17cc865033cef306699d68832352362b935dfc32260b0d6 SHA512 5bbed3d4aa7581c474b9ab804f82c2a580529c32fc4755ed328ae04ce8f9031a96ee45bb2e9bd33cea8ab43fa3c6e3a0d0d6fda84dee8cc2d120e934f1a8389b
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild
deleted file mode 100644
index 8eaf25ef8f17..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-5.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's PCTV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.0.0.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.0.0.ebuild
deleted file mode 100644
index 8eaf25ef8f17..000000000000
--- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-6.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's PCTV client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.pctv.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.pctv/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.pctv-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-stalker/Manifest b/media-plugins/kodi-pvr-stalker/Manifest
index 3f30e972b3dc..4c3ac4a6869a 100644
--- a/media-plugins/kodi-pvr-stalker/Manifest
+++ b/media-plugins/kodi-pvr-stalker/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-pvr-stalker-6.0.0.tar.gz 114838 BLAKE2B 31f567d73dc4851acd748bcfa8187014aad9451e05727cf8b8b705ec936b10b39e62c82f451c6b4049bc70c70708beae2228cb0b5ced71b34de53b497c137076 SHA512 99b9c2a2876023efe510a9970e0520804180e138d63ed1a13fb94e86b346d09c252c8edf12f3c3a7d2610d80d25cc74e938b35ecd925846f6adf648430b0938e
-DIST kodi-pvr-stalker-6.0.1.tar.gz 114575 BLAKE2B cb42fcd4ecc7c65bac75eb12579d0dcdb5827312c275a9db998953366c6a59a1033d7d26cc9db91c909d694340bb0eaf53e9d982604ec45b8cb349c4210565c4 SHA512 e71e37e7b440cb2d4e6f72400cdb457fbcdcc39893cbe70144b9ac1941429f45b00dbf7516b25a8ac874ae471a14335ce74c845239a444446b1fda97361b0757
-DIST kodi-pvr-stalker-6.0.2.tar.gz 114593 BLAKE2B 673a512ba369a85c6b08820bce845ec38d1ad4710767e585fe18f24c73bbf2b589ed3b52e3a0868a468e57094509ec2bbf1a7477c3602aafbac40095e2948bad SHA512 c8d5a2fce823e9dd00af53f12544ef6f5294b736032fc94d53312b018fb9d6ccbb9a2249cf4d41a40c89b0a0e42dbf252c7897e14c33e5f75487620260e493a5
-DIST kodi-pvr-stalker-7.0.0.tar.gz 114736 BLAKE2B a039de58e9f0cc687553b9bf852b4b4fe2f7d1af2682322b29d97c7452b8f2bf5015b72262ae680557666144403bed605b9379e4b7a79eb1e832091cf21e8f98 SHA512 d916bf0bf12196672c8576a1e30fb4a6e4fca48d0dcb0e5dbf28bdd78a4266d13a801d92b304bc2b08cc80c45c78081b3676d71331ef42849e99ecfd5848a88d
 DIST kodi-pvr-stalker-7.1.1.tar.gz 118225 BLAKE2B 258c45c85ad71109e44c2fd52bbe9b04aed996cee12b7e2651ddc3170a5c0c6409d0beaf1fffef28cb71a78d0ce621c69297762be32e15f660c3f0fada2c610d SHA512 9f47dcc44f1f5448b36b456778e8592768e28253083aae26a7d65e1f793c841b0c5fb2f83cd398e0895cdd7e31a608c340c518e4d7e63d0075d93fef5f738739
-EBUILD kodi-pvr-stalker-6.0.0.ebuild 790 BLAKE2B a4496feeb3d9c7b45a68ad3446da701dc1a9e89994a6fce095ad350d9ebca8950f8491a52d7260f3a1a1f241462b6afab2e1c3e334e7a34f6da5ce0a7b5bb3dc SHA512 52f717dd999f9ceea6e725b091f0bec8848185af2e217cff13c5f313ff823c932411391d104d399fa6b49f4d74bb2ae484a57d3e3932cd6b038db86f2fdb96d4
-EBUILD kodi-pvr-stalker-6.0.1.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
-EBUILD kodi-pvr-stalker-6.0.2.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
-EBUILD kodi-pvr-stalker-7.0.0.ebuild 764 BLAKE2B 05f17933376d5b3638424ca0bd391d8c18e12f447e0c87f7a356c8926472576e2a5877ac34f5f4b152571194af70617550b404799317a91203b2108a5b49be0c SHA512 e295129a519729c63b6f4c25250493dc424cf4b84bc6a02b1df8811a029a4987f26b34730d22938b52d748ede4c2a427816e3cf613df3de6a12af08ff9b2902c
 EBUILD kodi-pvr-stalker-7.1.1.ebuild 764 BLAKE2B f6808a5ddbd994ec10c4898b9def7433032b435466315d3ceeee19b7ebff03b8b11c3c9df60bc787f7626c8cf8b80a01af0f083d05b2cc5bda01e1206b4ef32c SHA512 f20f86f433535538ac7865421c9ecb775c153322dc04e41e9dbf13f9308df52b2460cebec3dba4d706f8bc22272032a286463497007abb8decbdd957f63cab41
 EBUILD kodi-pvr-stalker-9999.ebuild 765 BLAKE2B 318d9c6605fbed8919332cab9fd6d12e3dc0af107c89666818d26e1325f46e0c4f86d5ba8275daccdf83df6958983fb22abac7f26d4a87e0059694ed15e29a15 SHA512 053da8b2b6eb218e1f33e1fcccb6c12ef7662530acb4cf19b20fef47005db281064167a1d68c6d2d9848f3ffbca13c63a82e4259c31ce732c91737be12acdfa8
 MISC metadata.xml 364 BLAKE2B ca139995e33c15e3d8c3de244e88e4a7730ac37c5c67dce38ed4b4f56218c6a44fbb4aff4cc1cd0b5f6ab561ead0bb51f0bf52b08d467ff32ca24ab232533e6c SHA512 2d0560972546e526ce491df6d7c84c9f7d4a80a9629a2ab33b2130aab8e23c370423759ce8d05324b7f659f514b7143cf65cf2f7c4276e1d4280e1f8869ddb9b
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
deleted file mode 100644
index fd220bfdc74f..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	=dev-libs/libplatform-2*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild
deleted file mode 100644
index 72e70d8feae4..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild
deleted file mode 100644
index 72e70d8feae4..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-6.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.0.0.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.0.0.ebuild
deleted file mode 100644
index 72e70d8feae4..000000000000
--- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-7.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Stalker client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.stalker.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.stalker/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.stalker-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/jsoncpp
-	dev-libs/tinyxml
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vbox/Manifest b/media-plugins/kodi-pvr-vbox/Manifest
index 2caa070578c7..e11117e4764e 100644
--- a/media-plugins/kodi-pvr-vbox/Manifest
+++ b/media-plugins/kodi-pvr-vbox/Manifest
@@ -1,16 +1,4 @@
-DIST kodi-pvr-vbox-7.0.0.tar.gz 159504 BLAKE2B b0046434338d0afbd11b965a58ce292e5c141ab4ea13e07ddba3868e1217e50dc4d266351a6b1b6c08287bf65b7eb736d8efc9074fcfe602d30df49a41141632 SHA512 7e8965422c750e00104c27f6b67d6d14648c840684702bb85cd7350647734848ebcc43bc6cf53e2edd2c432c8e1289908f43eafb87bc7cf70652026abee0177e
-DIST kodi-pvr-vbox-7.0.1.tar.gz 172788 BLAKE2B d9493cee26abd8ff74aca66ea737e81a52b835c885ba94cf120f6a78e1d3132e102af3ce2aa7eb88fa3c1a522e934ce8c0d3ed935478fd3b2092f8b86ea9fb83 SHA512 fd5caada7588d14d5cce84673cccc41831379ff10f67e2b041406f82a1790e7dd46394e5bc2a106ccb3b01261eb09a7bec76111693aa1eb5131d5f275ad8f4bf
-DIST kodi-pvr-vbox-7.0.2.tar.gz 159326 BLAKE2B a4d463e52417ef82d13ca29dae9b6cc4e1b5582994f88ea7175410bc21fd9e0461c8b4908627f06896aaa130c3970be62af7e9652a60df8495a2b84160b73294 SHA512 b8557dd74f3d0e8a25f83cf3ec2230032f6bcfcb24f1ef21f076a7e51d65115dc583f8b8898e9dd426fb81605687c0aba203774567b9d993d5de68ba4af915fe
-DIST kodi-pvr-vbox-7.0.3.tar.gz 159325 BLAKE2B c31b44ec28f6c3f1a0a031f2d435b3a2659913cf2e7a0a00ffb4006c11c5e9298e7d0354645d972b64b76ae40c111693b19cb2b262ae163d01a6d2b67806a70c SHA512 eb46342f63218285a36ca8298a021858517a11752a53af998a73969d267a28f1693d8c6b7132292dfd5e12d8903e8b5a00dda4ebf51363bdec03c6d712239b53
-DIST kodi-pvr-vbox-8.0.0.tar.gz 159484 BLAKE2B e431632d5ce282d29a976426e92f93d946c7bdc8078164ee4da8f22e795c14fb8b66f183f0957bb8b322762dab673e7c320db2102d21162097502f098f5cff5c SHA512 5d2d1e4fb824d8a3851650d5cfc539b19c6d10983cfb3a5ad931ad835613fbd6089eaabd5de1807eab16039bac98e49623ca27022b09b864610b0c751499bda9
-DIST kodi-pvr-vbox-8.1.1.tar.gz 163007 BLAKE2B 7f88ffbb8b939457f25d47f1e29d7a85a4941e8ce6457e7d6ab27fa2d1f2848da3e37dbc2986e8e0e07d837197141402808f0c6a99c287555b463ff8ff3a5438 SHA512 5df148a9ce5faebc6abcf359616a6ebfc38ea0039574ca6c7bb4f2ff3b644d5a880f1caa8746d8f5b4787720152c478a3b1a7eeaa64b5310214354ec540e3781
 DIST kodi-pvr-vbox-8.1.2.tar.gz 163016 BLAKE2B a140551485e4bcfa1b067d56b571a046afd7e10944c1b34221739b2a3c9ef6f17523b01a019ba7e049557970a1c9eaa9bf6733887357ab89d498774ca1e1aa20 SHA512 f0e3bed8305d9f7762ed41c3350029e5b374cacf3bf936e5b35503f651761e7addca1f961a7d44739dfd92e48bdd7756c53b616e2183c91c446afc2411598eed
-EBUILD kodi-pvr-vbox-7.0.0.ebuild 699 BLAKE2B 3ca6d54444eeb7e3107e725698ca26ccbc881b4f836ef001099aa38858bfb18d6b9efb2696f76eed9ac4c2068a3c04d361306a65ac4db2f1666494a3b32ec2ac SHA512 d977479ac9890ac3a1fd2206aa27bb27b2fd3a109a3ab9c57c8910d738e517168553891e9e80563493ce855ffab589316cbad3acb9d43abc10173c9fdde719cc
-EBUILD kodi-pvr-vbox-7.0.1.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
-EBUILD kodi-pvr-vbox-7.0.2.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
-EBUILD kodi-pvr-vbox-7.0.3.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
-EBUILD kodi-pvr-vbox-8.0.0.ebuild 673 BLAKE2B 78aa8207b33b7d5efac06abed5352c35fe0b3284090c34dfecfb4ea9c22d97be0d088441897d36c1cb8c4596f0032f1bffd651861565b67b98200265afa180ec SHA512 923567eb272223b86ae86bd8281778713ba398b46539845c675e12e4b7c5ada66aa21915333b8332039f2ef2bceed8ae9b4fa5b79303518285c495ccc412466f
-EBUILD kodi-pvr-vbox-8.1.1.ebuild 673 BLAKE2B 455c393a01fe938609f33b18b6204ae959f1af6f256997006964f57c7b40a631852c118cebb717a9d7c42e58143988246680b2d0b35bc267f3810b854cd8645d SHA512 586c6d2340585143ca6d45f50b76e8e5c19a6e1fafcfd69bff2f5a2d081bce25d677a6373d9bd02b192f84d483fa609631b002a22039766947cb64904ce2c7b3
 EBUILD kodi-pvr-vbox-8.1.2.ebuild 673 BLAKE2B 455c393a01fe938609f33b18b6204ae959f1af6f256997006964f57c7b40a631852c118cebb717a9d7c42e58143988246680b2d0b35bc267f3810b854cd8645d SHA512 586c6d2340585143ca6d45f50b76e8e5c19a6e1fafcfd69bff2f5a2d081bce25d677a6373d9bd02b192f84d483fa609631b002a22039766947cb64904ce2c7b3
 EBUILD kodi-pvr-vbox-9999.ebuild 674 BLAKE2B b592bbd6fe222c5d78f91cffef013fda2b46bcb9f973f0d28271d176551c00aa4aa17f93af173109243fd0848301fb013adb2243b622a55a58c5fe3c86ac16f3 SHA512 07a6264c0db07e3f8d6bf45c206de39f737ff185548c669d6c84e2b2c1193169027145a2cafdfb37ff72ffeb33ea5f714a8d45f86869bbe9cda53f95aaf4666d
 MISC metadata.xml 361 BLAKE2B 456756898a753c1e40a7dddf1c3dfbe7e8c640862402d254cc6f22c8fcdf788e315944f2b903fa053aee75ca3036bd575b077a177b7e035930c1f2a6bb6dfac3 SHA512 1a81be6e643839cb040a366d24a437f5b68e331de8e9cd58d593cffdb82b4a20ddfab71984886193619e2526cc3d9d4051d84bd464c52288924ef695caecfa65
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
deleted file mode 100644
index 482dc7190457..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	=dev-libs/libplatform-2*
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.1.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.1.ebuild
deleted file mode 100644
index 9ffd4c8c835d..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.2.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.2.ebuild
deleted file mode 100644
index 9ffd4c8c835d..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild
deleted file mode 100644
index 9ffd4c8c835d..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-7.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.0.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.0.0.ebuild
deleted file mode 100644
index 9ffd4c8c835d..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.1.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.1.ebuild
deleted file mode 100644
index 349e008af303..000000000000
--- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-8.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vbox.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vbox-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/Manifest b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
index d7139dbaa39d..7b7e0b8231fb 100644
--- a/media-plugins/kodi-pvr-vdr-vnsi/Manifest
+++ b/media-plugins/kodi-pvr-vdr-vnsi/Manifest
@@ -1,10 +1,4 @@
-DIST kodi-pvr-vdr-vnsi-19.0.3.tar.gz 183828 BLAKE2B 69b14fe2b8af4c03725e300ea21ed189e0df174cbde1fbd7c020aca279b6af5884c7cc5b4cd90dc220fa20744d409f1b59b4e84fa0e11ddd1bf76ac494709ce2 SHA512 eb27dc9fc868a016d39718f1a6f3c719808231cfd092dcc0ed5b85ba017ad8f93e4c562c1475ff3c7e88bbb08ae33aba14cdea7eb4b1ebcd7b64da42bd7f1673
 DIST kodi-pvr-vdr-vnsi-19.0.5.tar.gz 183902 BLAKE2B 1bc2980a63cb1f04a6b7f609286eef8c710175d73f5b7f7c52f9c816c74ef6d97e23453fb636c257f76924c2763e6e5845ddc1a54bb43564c04a1418d9be7683 SHA512 67a9169069fcfb6a1b64f67a4eb5e46ebc6da61063afe7db0cbcc8abd4c79d16e446a1d080c42f4153edd26c2fe262d1c1c595c4ee9880a33405887a2817de6d
-DIST kodi-pvr-vdr-vnsi-8.2.2.tar.gz 167074 BLAKE2B fe6cafacb16b31456f3d6f103a836a20cb2fac9d55aad56df858975ba23b9e5de4d29bebc97e276028289a98b196f96f0c30135f94d8316ea6da1c7154a16775 SHA512 e5ad58926058473feb089ad96acb4b348c674fc77ec412449cde36d508c75409bc6bfb24bd804b5f50a202e83a8a01b6fd823a1667de368c1f4b768512d519d8
-DIST kodi-pvr-vdr-vnsi-8.2.3.tar.gz 171586 BLAKE2B e7b9beed693c84f7a94657eed297a1d76669c2ffcee5be5604d1dc239b9de0811848aaafa87396125f5eacdb28ea7db0e8d3d52f7d4c63e46e0c830aadc8f4d0 SHA512 9fbb3e988fe6352fde230ce072b35e591d69015bbfd93a4e61b2719a1f36ef495d23db30d44a6c611dcc1b4e36339b454138902c3f815940c5a77ff2b3d9c62a
-EBUILD kodi-pvr-vdr-vnsi-19.0.3.ebuild 661 BLAKE2B cebf81e18dbc468efa5259e3442217fa144ffabda8edb5782125b6276e42cac46895650eb9bce7832f639c1dc8541f9b6b8b36290d634535e84efabaa1057019 SHA512 e734ad50f2d766580e9d0921e56304e4fb345872ea39c298eed95c784424ebe4504788adf29040f26dff22b2e70d518d02c528e02cff9976a382c7d9176df574
 EBUILD kodi-pvr-vdr-vnsi-19.0.5.ebuild 661 BLAKE2B cebf81e18dbc468efa5259e3442217fa144ffabda8edb5782125b6276e42cac46895650eb9bce7832f639c1dc8541f9b6b8b36290d634535e84efabaa1057019 SHA512 e734ad50f2d766580e9d0921e56304e4fb345872ea39c298eed95c784424ebe4504788adf29040f26dff22b2e70d518d02c528e02cff9976a382c7d9176df574
-EBUILD kodi-pvr-vdr-vnsi-8.2.2.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
-EBUILD kodi-pvr-vdr-vnsi-8.2.3.ebuild 661 BLAKE2B 6f60f4bb43efc2b2e8bbba4b7e2f24d9c874482e3155cfc7d03f16cd0175c23ff6b0a9dc1213f198b834ad66025f2e5bfbd46be235149ff5121c141739f6cd8f SHA512 0d09ac8c609e093d6c257058d4c3c5a4cd886930eea51d29c215f0d17f5471a14079f02c69cc9604718338cf11c54a7a31576f6f27192edb85e584cd8b9f57f1
 EBUILD kodi-pvr-vdr-vnsi-9999.ebuild 662 BLAKE2B 384eeccddd28b9d8d779d82a84b5682f0e20360532c8ab2cb4afd727e3ea557c95d264640834d792d82a975665dfd769e82513f0bf5d689891930a373274e441 SHA512 bb86dda212c0ec83c1b8aae29698bcfd0109b426a718ef5e4c801fc598e050c3272fc0569c0603f21eadd146ca0d6687f16fa5d73752aba1dc2f9270eae6826c
 MISC metadata.xml 365 BLAKE2B 743bffd676479c2658150d9eba84c19a1a05155ba93676a680f66741b01d753f6b1487711765576a7f8cef3ee25730548b9c3b6d2839f4239ef0a424da1553d4 SHA512 188781df94dcbe012c319dfd312ca0ee3c7924f306409046aa8e2ae75cba79846cec69c1be04b9da999550f25cf700af8374604a6d0ae6c4e0875f44f249a4ec
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild
deleted file mode 100644
index fc0fe6a6a3c9..000000000000
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-19.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi PVR addon VNSI"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.ebuild
deleted file mode 100644
index 3dd5faf015b3..000000000000
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi PVR addon VNSI"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild
deleted file mode 100644
index 3dd5faf015b3..000000000000
--- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi PVR addon VNSI"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vdr.vnsi-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	virtual/opengl
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index ec0827de9c36..455aae9148b8 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,14 +1,4 @@
-DIST kodi-pvr-vuplus-7.4.3.tar.gz 285230 BLAKE2B 0ef24cb24f745494ea86ea025943bd4c159beaa684cacad569ef603d355b917351b92dd145d1fc8e3069896f404727f6aaa2567b5f3633fcfa9dbdd1c60fd09e SHA512 b563c29600126ac0d25c744be64d060691331a875b7945c211f1267daa43d8db034c717b1def49ad85aaf50f81826e4c7ffcff08ad4422fa67abe2ea3cf5557f
-DIST kodi-pvr-vuplus-7.4.4.tar.gz 946491 BLAKE2B d3a64a10b7d0b0774aadf6290f70a6f8fd90de0790616d4b64927316c46929c77cb49fa0d69aaf5ba847513d5ad1fa2d208557e4b0b071c04bda94f53a3d086f SHA512 21d705116816d6acc1b70b6b1bebc0ca4bc0eedc2e55c204697608597d6bc88be47b16f18a2d1b04f8f22600a5388062ae259842702ab1d2170ace496edee2b7
-DIST kodi-pvr-vuplus-7.4.5.tar.gz 947455 BLAKE2B 055afbc8dd7e902771b88e34b47ff7d42ab6e30de27d1779f54847a4d04cda920552b3bbcac46e1ae26f5a113f014d04998aec71b83c4ab242f966035df398ce SHA512 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b
-DIST kodi-pvr-vuplus-7.4.7.tar.gz 947568 BLAKE2B 92ed09db11542a0d8c027e2828dd55df464ebd26ae22076c00a617124c3503f1e70623ae594789f1867d7f1e54649a417198153d7841e569f43506cd09dc1792 SHA512 a5843b36a3249810e0f23c9df66079dfc587697bc3dc43e013392648c60fde3f09b461a8323389a50cb3874a1bed24139bef1db9854fdc579f23d246b5c69e3e
-DIST kodi-pvr-vuplus-7.4.8.tar.gz 947667 BLAKE2B 3031fb16698dfdab3c6466a44870760a930475929652b42fe72164bbc152db4886d5a78b1240c0729a6746fa9424515ac0a2ff583e9a0d1c87354a1e243cddc9 SHA512 669dd29a70efd6ef5b9698fb74560262bc2aff9a73c2220a452aa09b6f88323553338183cb9de95c268c1fef44352efade202512b531de90aec46cea402e46d4
 DIST kodi-pvr-vuplus-7.4.9.tar.gz 947759 BLAKE2B 58ad0cf68b8c70bee7c39a2e5a1eec874073de03cfa34b66c8f65b4fa84de88dd0c9a2d3fdeec55236265cd6ae748dde74942e1dd68b71ab64940b327c017426 SHA512 beaa89a348ef0fba0d51d982590731102d548f2c95c095ceed132306e7b76b4e5d9613be135c9c05d86a38b8b7203ec750e80dbb8bc5692d5f653fab9137c1c4
-EBUILD kodi-pvr-vuplus-7.4.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.4.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.5.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.7.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.8.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-7.4.9.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 363 BLAKE2B 2867e5ce9493e83de108c3d3f3d004d26690eba3eb89dfaccff216411725028a368716c97c636c60c9405c8771345a27359cc76821b79db759372ac67c742c26 SHA512 c9ae122d8b8c3817013945c96dcfb89ac091f07769e1e42c72500ec07871ff758060a821a6804c457169add9794b7a03ad5fc7330a2eb9db6ce7e05296c0d38e
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.3.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.3.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.4.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.4.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.8.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.8.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-wmc/Manifest b/media-plugins/kodi-pvr-wmc/Manifest
index e3595000049f..7720f097ce89 100644
--- a/media-plugins/kodi-pvr-wmc/Manifest
+++ b/media-plugins/kodi-pvr-wmc/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-wmc-6.1.1.tar.gz 185138 BLAKE2B c01e5c5d0b70e90d91a44d90170f308ef51fba287574ef8f89d091cfd26ee1a7dc520d4abcf9f7ae2e280af5fa0db0dcdcb2b626d1888e9dd835eb18f9617eae SHA512 4d9adbe042e6b9a0f8b03be2d3981255199a76960d1a94541f0d2bee64efec76de24c8a387b3ae867f0e1d4633d25890a3870e85dc7d683f2db904e006a52df4
 DIST kodi-pvr-wmc-6.1.2.tar.gz 190018 BLAKE2B 311406bfdaf2aa36eb8f11257de65d555581acdcff19d6cb0bceb2d1cebe3a33fcd49cfd2344095e5ae482431f00964c6d95843e0c6702c2e2f3d2e7092d3096 SHA512 b0e53c8494a5c811182358afbc7834b7cc51104839c7b4bf59047ef00e4b9bbf013368d94f095fa384dd4aa590a1f64c0235328b652962cd39430273c8e41c0b
-EBUILD kodi-pvr-wmc-6.1.1.ebuild 671 BLAKE2B e17ba5285a0582c02a90770f51011686dc5ce76b161c61f39948755a2400482a04e51a7f23a2cfc5dcdd1d1f13bd081699f6dd7b9778850e8738f0946261aa94 SHA512 8b8d41dcf46f06a76593e36d8c098c3835d488b5b08d18eae6221a6f11e0f2d46532d46ae17ff60740820a2f13c19f70cebcb05412632ad71c6e51db93535bf8
 EBUILD kodi-pvr-wmc-6.1.2.ebuild 671 BLAKE2B e17ba5285a0582c02a90770f51011686dc5ce76b161c61f39948755a2400482a04e51a7f23a2cfc5dcdd1d1f13bd081699f6dd7b9778850e8738f0946261aa94 SHA512 8b8d41dcf46f06a76593e36d8c098c3835d488b5b08d18eae6221a6f11e0f2d46532d46ae17ff60740820a2f13c19f70cebcb05412632ad71c6e51db93535bf8
 EBUILD kodi-pvr-wmc-9999.ebuild 672 BLAKE2B d33f39250a6b1faad7a0a70451a31c08af9fa51f90fc691aea2227585c8b6abd6a07c66bf088c54230df701c242984d89b14d21c01d44a12e522df14a4492f73 SHA512 a4c10a79ad84582c2a7384c84da599446c42cf75e8b878510743a23b7b95c375c440944231f396ce239371c791fb5e7c8a60f21e89a6822df7b66885fc0d1fec
 MISC metadata.xml 360 BLAKE2B 10d20b2446d7733836eb29b033dd6d4e6bd18204358c0b999a63405e57c54c94e2fe18be19ea8ba02e5ee53e8f293c0fa303fab66f4d85ab3e2be760a614ba0b SHA512 c6a6d7cac48620a863cf45d68d4fcdc47589d70faea27efaa124f61180d9b563d91369f2a5c6ac4ee89ef46fb383545141e14c7d7cdc1e181a60fce01476c032
diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.1.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.1.ebuild
deleted file mode 100644
index 66f8557b7b1b..000000000000
--- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's Windows Media Center client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.wmc.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.wmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.wmc-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	=dev-libs/libplatform-2*
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-visualization-fishbmc/Manifest b/media-plugins/kodi-visualization-fishbmc/Manifest
index 5e7f527065a8..91b2483fe13f 100644
--- a/media-plugins/kodi-visualization-fishbmc/Manifest
+++ b/media-plugins/kodi-visualization-fishbmc/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-visualization-fishbmc-19.0.0.tar.gz 377037 BLAKE2B 7c60ea6ae87a2d9caeeee34e6b48117b2d41fc339bdccd88f2971ce5c3ca6f757e2884722ad793bb2a96c04a3d05aaef8fe329e102cdfaaad77d4fdfe80d3215 SHA512 f982c9365039d6b02099ebab9c8ff85ed27357780fe1426b9d77985f34d0053cc5a51183ec7ec73ef84b2131325f4f9786171d609306bf06be3c2e02bb0e40cb
-DIST kodi-visualization-fishbmc-6.3.0.tar.gz 367650 BLAKE2B 78081d673a1eddea8d16e355176eed1b61f0a8e748d0b831f74a3780a9a11be19bd05c1376413dfd10276192f1a3cebeb11ec8f258fb96f16b0128112fa6a2b6 SHA512 02f72476571b2c49629406394eb55c6d9635b7359e8c9aee545d1e486060282389c794657016ed9aed9c2c5471222170b32ac78d5d800f7cc906344bae9a1332
 EBUILD kodi-visualization-fishbmc-19.0.0.ebuild 897 BLAKE2B 9f2b74230857d899534c82c743b999e3082ff53150c2526b4f614a795f3434a30764538f06c3b35f5653fa932355c263abcaff54e438888d7a9a1e355f1d6bd3 SHA512 358f8af55e57d5ca4b97267402b4f626e2c6524af3f11677e39d5f7dce5843a04f162e9ffed39346082fba7dfb42f9e017c78d2eb39b9dbfe46d18aecdc60683
-EBUILD kodi-visualization-fishbmc-6.3.0.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
 EBUILD kodi-visualization-fishbmc-9999.ebuild 897 BLAKE2B 3be223eacd34426e59c18a8b8a9518a8e1a3ade74ce0428555b671a9cf5ba2b61158387a4f73cb1460b03351dd48b953cf6d938dbacc85f2780a63990369643f SHA512 f1eb1a7d0b7c9143b65ce12a8b9447cd2c7a30b5ba4ed612c58a07710885674d7df14efb372a97735d327a0915c03d52459a0c27f1e8f0b7f8d16df3af094ca8
 MISC metadata.xml 374 BLAKE2B eca8f543ad7ab231d6e57cb710ed477784951cb9db3119c7e968ed66c9deae7592a940d52e0d59cdad247b775c43d86cfa3b5e109271660dcbd9f033ca719ce8 SHA512 d8fff762d7953375ce13fb285e1a7f6ca86611564a72bd8e3887f8c595cdc77fb3d53ef99ebc1d5bb2f6eb5df1af4effe976e6b50676bbf1f0c16a26e98280ae
diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.3.0.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.3.0.ebuild
deleted file mode 100644
index 4264440c3a7b..000000000000
--- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-6.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Fische visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.fishbmc"
-KODI_PLUGIN_NAME="visualization.fishbmc"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Matrix"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-goom/Manifest b/media-plugins/kodi-visualization-goom/Manifest
index 5cd33ab95f48..15527a8b606c 100644
--- a/media-plugins/kodi-visualization-goom/Manifest
+++ b/media-plugins/kodi-visualization-goom/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-visualization-goom-19.0.0.tar.gz 1217302 BLAKE2B 7e7092d47a176cb25930616eed696023541e2e056efdb9b0cb0396763f761ec34d3c38f5c95540408dddb14d26ca9f95817b6bba12931485046f3081bbb17cd8 SHA512 199fb3dfb03f2874b5cf6df33fd29de3727026c98a7115333db2f19fa880a723930a1b8336ab125f769928af1e823b01fbdaeb66ee02f673c77d68cc61b84f13
-DIST kodi-visualization-goom-3.4.0.tar.gz 1210534 BLAKE2B c871188f50a1deab108e36e4199dc4d0450ddb59cf8f87090505b46f7494a66006b796d4a7c60e61057f8668dc7afebbab15e1018ed8fa644d77315ea8b3c2be SHA512 d864932202b2611b435b91a0ced86cc60b5e1853dfa958651a7327e931d7744b267d4a151f1a8e1d8080f37c009b6bc5d22ca9cef5bf2f9cecc8d4a114fa1971
 EBUILD kodi-visualization-goom-19.0.0.ebuild 889 BLAKE2B 7155f84f70fa0627d5172987e97397f0a820bae53d2a9991fcf314fec1c26f5827ce292a54acd56e91fe7a8cde3a684d0a23d11ecc6bbf82558fc703ff18c7b4 SHA512 ddca5206b9241cbab843cfa198e92389c96614747f635b92e79b0c42b5788a9a816a8fb61d051f3cee5efbabb786bd6baeea9278a47819c3f3cd6a683760b611
-EBUILD kodi-visualization-goom-3.4.0.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
 EBUILD kodi-visualization-goom-9999.ebuild 889 BLAKE2B 81ca413eb39a0e0c82a394f92ee1660dbd26e560b6bb36ba48fc2ae2f029b5ac3cbd12492ec9f31924fb0dcc1b30ce78839078ce0c81b1c0a61021ff12be5e1f SHA512 a6e1c6a9e3f5fcd943e36a2748005e90c2a4924fbaf8580c0cd1fb8247d46e44f6b3001605f4c3b8a13f3324850d0ef19549317bf976c33da189f1083c90f7b4
 MISC metadata.xml 371 BLAKE2B 749c20b4975041f9c0da8e05bb9b4bbb1445aa8d7349f343a9551df494a206482d4d5b6de52c512b39fb1cf8392d19d17c60dc4514cc8b8b7e638904b88a050f SHA512 0b4e73209ab4132aa0478c5b1d95d9832c7c375484d0dd4f322d37582ad5eb5445d7c0cc8d02ae0522e714f569522639606fbd78b54fd569730b83ea47fabc46
diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.4.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.4.0.ebuild
deleted file mode 100644
index e1aa393b2927..000000000000
--- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-3.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Goom visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.goom"
-KODI_PLUGIN_NAME="visualization.goom"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-projectm/Manifest b/media-plugins/kodi-visualization-projectm/Manifest
index 5fc72c143995..cad67aca32d2 100644
--- a/media-plugins/kodi-visualization-projectm/Manifest
+++ b/media-plugins/kodi-visualization-projectm/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-visualization-projectm-19.0.0.tar.gz 2512848 BLAKE2B 34b5aaa3a3229565a887e9d030c43939837e9480d8e4d2cc718c06561f098054d41e293eaba15378e95d835cbec020171add0cd1d0a6ebb75c18625afa4a85c8 SHA512 d219f16784f4077c8823f680c0c6f6fe4109eaf3f6105fd0e6ca55d9a6f12942c03bce0f244edcf4778d3359850fd1f9939ebf76d9819791a45f8afd56d31ef7
 DIST kodi-visualization-projectm-19.0.1.tar.gz 2512570 BLAKE2B a402b4b0a0e1cd8489f9bfb600ac4d69741044af104c8e649061eb5f00d53891966fb44820b439b29d17725404e940da7a548baa2b610fd52bb217a90fb028d2 SHA512 be7a898e2646e0042efb93334ec61a668ffecaa64c51ce041f4a044461dd46b6964eea5a8ef9de5e97c6fa8bb841be4d6e153ca985e727eae1f399b15b5fa973
-DIST kodi-visualization-projectm-3.3.0.tar.gz 2497200 BLAKE2B 894e77cabd96f8862f1873c5b506d358d4808443a92947586ae6e4907cbfe931d2ab0af19a0d6d5a35e7d93a67c184eb886b217887b45895b552d14684bff60a SHA512 fbce9121a403279a9f54eced08f2069ab6e1f732ef5c6b82380323e2357b70ffa88157428afd4884b6d119aa5a02848718e48602ce9d5f1454c8fa5ed0f78e7b
-EBUILD kodi-visualization-projectm-19.0.0.ebuild 907 BLAKE2B 797d2d018f43fa668cedc41180b549fe5657a6251b46fc20714d5e5ea9504b3122c2f8df9476442e4a25b8c6c4624a036809507915e1bd3f7833a30315aec718 SHA512 cedd92cac001364d4f4c18214a959b3feac46fe938c56e39ce33aa6380f78a6f204dab6be6b6e20632161aa4b36ed931715614070af30a2961d743f899bf0f5b
 EBUILD kodi-visualization-projectm-19.0.1.ebuild 906 BLAKE2B 29abeba5df375bef5dd3944b037f903b5f75be7d1a107fb94a8f8a466cb89cddf9751594f03aa0379c981267f7bb002eb49cb01d2aa630af3f187c0d1f7d5bb4 SHA512 62a820dd3662182a48a6a2fad8d952297ec4c4da1b86950c7024457a1be3060295ce753ac277b010d12103fb8bc82d730b49edd07b8c5535c14c39a0b24a8bec
-EBUILD kodi-visualization-projectm-3.3.0.ebuild 906 BLAKE2B e23dcd339afecc961dc0734361163b4df642f249850ac509bc6c14245984a98ae85055adbadb7ef1f286dbb821ad10aa570fcd3709833299018caec70a1aa81a SHA512 2a68b6330079d2519ca484523589c84e25f1c4d149891cc28095cbc0f753dd7a52f42015141959f63ec36217730bf0b93d11c2e43c34b35cb4755d3666c7b6d5
 EBUILD kodi-visualization-projectm-9999.ebuild 907 BLAKE2B 797d2d018f43fa668cedc41180b549fe5657a6251b46fc20714d5e5ea9504b3122c2f8df9476442e4a25b8c6c4624a036809507915e1bd3f7833a30315aec718 SHA512 cedd92cac001364d4f4c18214a959b3feac46fe938c56e39ce33aa6380f78a6f204dab6be6b6e20632161aa4b36ed931715614070af30a2961d743f899bf0f5b
 MISC metadata.xml 371 BLAKE2B a325e7aefc03877668c082aded651df58cff959168ca4184db4e50c1d21688c10d1e1a3548f432de0d23ac248945524a85b9f2e8e0d5bc32b50c641d5e179d0f SHA512 0cf1a8c39c77aea359d0680c537280835a8d64c2a177d697d395d0d7a0c533b8a9e6e48ca8554f6b012e3a75a7a57315e1a3ba6d27029d6fd23dd27386fc5dcc
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.0.ebuild
deleted file mode 100644
index 8bde368c1ddf..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.projectm"
-KODI_PLUGIN_NAME="visualization.projectm"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	virtual/opengl
-	>=media-libs/libprojectm-3.1.12:=
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.3.0.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.3.0.ebuild
deleted file mode 100644
index 759f84a9e7e2..000000000000
--- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-3.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="ProjectM visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.projectm"
-KODI_PLUGIN_NAME="visualization.projectm"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	virtual/opengl
-	>=media-libs/libprojectm-3.1.2:=
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-spectrum/Manifest b/media-plugins/kodi-visualization-spectrum/Manifest
index 5532577f69e6..30f79f2f64d9 100644
--- a/media-plugins/kodi-visualization-spectrum/Manifest
+++ b/media-plugins/kodi-visualization-spectrum/Manifest
@@ -1,6 +1,4 @@
 DIST kodi-visualization-spectrum-19.0.0.tar.gz 327030 BLAKE2B 5265d568cfef5faa8f2acfdf6a590d1b6fc306169bdafad1dccaf6c93befaedf18ef555345081047602ece0e084e235d14880c29abe9c4302be71ca9f0cfca52 SHA512 9a55a5c6718fe12e1eba71c4c0797ed151180f0b220ea76aa88ba5792e31443b3e8a2add725dc4074993e2789b67ade6d84f8a23d87ffe9ec91c23395872ad53
-DIST kodi-visualization-spectrum-3.4.0.tar.gz 315666 BLAKE2B b87b2f29a3dd2cb46058661362823f3e6005e354468a5b83ce65b5e5ee59fc56c9a35a22207c61e98c83e964ea682501296a66f376f9259e73b5e76250e08281 SHA512 c653c867dc1fa4d0c4de9cb3e5dcf90daf73ffdeb2b4f50bdcb651799fd1adec549a11889e4a7fa3b9bca46ad36c68e5cea925b0cf5d006b975215c682b9b584
 EBUILD kodi-visualization-spectrum-19.0.0.ebuild 901 BLAKE2B fd3259f6311f804abc601f38b5949aedaeca3a55dd7b32354454cf2134d269492a5de170d9ac87a4c910b44991a3951fd19d1d69f78b428684f300b5331287c3 SHA512 621d29160f83584c88578181031f2ebe8964581a20b0544797daffd0269f1087c378a1f658304092e5395cd64412f6da6018dadb8d06a2fc9a09048f110fa150
-EBUILD kodi-visualization-spectrum-3.4.0.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
 EBUILD kodi-visualization-spectrum-9999.ebuild 901 BLAKE2B b88b0cbf1f8679335754842e1f9abd496176c1239354b0b677de244042bd2d93c3f99a5500c3aa28fa5dbb381fa15494d2194530b01074c8e5ce77aa032a3b80 SHA512 342f35baa5c09ea6f50203d9ac36631d2670b72e6066770ada9a465e28e087455b109dcfd04f590f0765cac89c0280f3688a60651051ffb43194cec044399b16
 MISC metadata.xml 371 BLAKE2B b677a2d822ae451a429b5d6201d8e805fd4bb0979d7f365b84614f95921d92ea0b378882f9cbe1f3edb77b89a585349da9bb56897958d789a7dcbc9fd500ef5b SHA512 aea93b2c79f11f19d50af71a4247823befd6ea01c4c0c7155eb0757aa49cadc591200cb9005fc2474402e8c2d9298fae36029c9bb9c187a769e39d7e47e2f272
diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.4.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.4.0.ebuild
deleted file mode 100644
index 3284a024509a..000000000000
--- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Spectrum visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
-KODI_PLUGIN_NAME="visualization.spectrum"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-starburst/Manifest b/media-plugins/kodi-visualization-starburst/Manifest
index d4b1d2f93850..d02115c2fc77 100644
--- a/media-plugins/kodi-visualization-starburst/Manifest
+++ b/media-plugins/kodi-visualization-starburst/Manifest
@@ -1,8 +1,4 @@
 DIST kodi-visualization-starburst-19.0.0.tar.gz 139450 BLAKE2B 610d62f35f2bd33385a37605072291a6df29f21830b37983563000b03bfdc572aeb58446423bf397cdbcc28e493c394ab368162bcde8ca7ce5e925bd24d76b61 SHA512 de531db6f095171c29c16b5d0f9c2a0c438b21b2b069074f62ff2b9c94912bf7a513cb2ef342c715162417ba61d1932f0f067c4eac7e7418658548b363178c71
-DIST kodi-visualization-starburst-2.3.1.tar.gz 139560 BLAKE2B f906e1f2b60c7685e354f44f4f1d2484d18adc21255ff207fc9f9a55dd7815089cab341acd06dc71cb07469508a0c0412ba1a6e1fbff26c2bd3f7445eb56fe44 SHA512 58b332c4b8729a599710cac969ceaacc23c158b30544fd5fdf9b2d168718c4c032c89e6980d3dd107dbe5de40435de6637cd25f597a3cb01287b80876cd97ff0
-DIST kodi-visualization-starburst-2.4.0.tar.gz 139487 BLAKE2B 094eb87051f3d296f1a66ed497d49e57b6080d5f2db2c6a7736056c80983282767e8ffdcc1108b3f59f0449819c274890abd463f6dd3140fcf9e5424899f9a53 SHA512 2c7ed9b1edb9310d48fc53d5eec9746d3fb51beefb24ebf7025d4b5c72ea67c89c8b92846d4daac0ec7806ebd8c39d774479cf582feac1fcd8364ad67d0f3a64
 EBUILD kodi-visualization-starburst-19.0.0.ebuild 904 BLAKE2B 960f3aab5bf0a13cf6683cb7808c2ccdaa0fa43aa0d27f44f33d5a351c905365ccfa117a81d9c4a630c75dfa4d28c0c5611cae0b63a613aa14a131edb55c59df SHA512 4518576f94aa2ac13fa929d755b09972cbb6ebca2c048dc31ea293f205a8e1cd980f92097807e50042e7728daed2db949f023fd3d02b28354fde44a494c46b43
-EBUILD kodi-visualization-starburst-2.3.1.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
-EBUILD kodi-visualization-starburst-2.4.0.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
 EBUILD kodi-visualization-starburst-9999.ebuild 904 BLAKE2B fe13cd815cbd7b6bdd3919049fab610c386830ff1bde099900d94750a8ddabb9dffd5e4a7b3daa48ce0c162e42f46d101c19f06eab3ec84c242d1139b6eb91a5 SHA512 a24698b081596e03e69e34c78ee2b2fea74936ef858226fb2419d68ea23ff0f8f6fcb0e862a30ed6ac1289e9c1929772bac44bad92491515f2e89dce77045711
 MISC metadata.xml 376 BLAKE2B e1ab647f13adfe9267db29ba3dbecb254c1e8b000abbe9055cfa8d489e51a22f23c04005d79b6474fd2e710ade536393931fba75c2d501d036974fff874880ec SHA512 e0595bfb2c1bfef45d54fa406ba124c5ac837e973f6c48df8cfb5dcbd6085435000c5bedc74d18a34a052ff3e19f816bdcb24845646ac222c9317bb99e763471
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.1.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.1.ebuild
deleted file mode 100644
index 532d4ca45e77..000000000000
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="StarBurst visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.starburst"
-KODI_PLUGIN_NAME="visualization.starburst"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.4.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.4.0.ebuild
deleted file mode 100644
index 532d4ca45e77..000000000000
--- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="StarBurst visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.starburst"
-KODI_PLUGIN_NAME="visualization.starburst"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-waveform/Manifest b/media-plugins/kodi-visualization-waveform/Manifest
index 1af4356b924f..bc265e71e6aa 100644
--- a/media-plugins/kodi-visualization-waveform/Manifest
+++ b/media-plugins/kodi-visualization-waveform/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-visualization-waveform-19.0.0.tar.gz 552364 BLAKE2B 589d34553d63f38322fbaa0a68a5c47e45b0339bdd0ac32e9b48ed5a6e2cdc066b23ee6eafebe6ce9938159f05d17e29c320776260913c1fc48ce82163587264 SHA512 f98b8b490e3855986d82e42469df0552aa272c0717215a756958f978ea68c9224a35c8ef75d97cfde0bbd9d7c00cc81abb76eb4eb243b64c502065bfdc554d9f
 DIST kodi-visualization-waveform-19.0.1.tar.gz 553122 BLAKE2B 64880cc04e38ac853ff1278a9c235cb696d30587cba830a0c77aef8076843cc6c8adccb4efb8ce1312aacd6e947a592464c45b70d1ce055d88785e3255492517 SHA512 562ee37dc051271c5e080d2dae391a9437bcddc25b397caa2eb7e2cc8fed73d2644fccba740fe0084d2876c1b6873babfb114bce873a2723e994be757c8a6a0e
-DIST kodi-visualization-waveform-4.4.0.tar.gz 540721 BLAKE2B 5d154dc309ec1db62f1b26578f26970c633671aefe00c08bcc0f15bed33b51f6c459f1849dad6c144eeba8aacc6f8003a76e96e10fc4e9a8d0b623342b82b875 SHA512 8452b5c9cb57c40fa79c58278ea6fa32e4a6845f0cb1555009aedcb3ce5759330918aa2c10c4fdc7c9fef97e6afff61d6145344ce5fccecbc576f64ac036d0a3
-EBUILD kodi-visualization-waveform-19.0.0.ebuild 901 BLAKE2B 396e59e6ab5d50130945cda03cacbf1db80b8d7c4b7ae18ba974d64fe4373b33b90bee20b138e11698c0d63607a23b76be4ea56395ec2246abf2663b1ca24b5d SHA512 3e23bd1d35340714335dd0c8d3bafd3e173dfc0bcaab98c802d4f388e572dab9bac532e889d3688456ed8dfab6ee97cee938716a454042daa119f0258b849be1
 EBUILD kodi-visualization-waveform-19.0.1.ebuild 901 BLAKE2B 396e59e6ab5d50130945cda03cacbf1db80b8d7c4b7ae18ba974d64fe4373b33b90bee20b138e11698c0d63607a23b76be4ea56395ec2246abf2663b1ca24b5d SHA512 3e23bd1d35340714335dd0c8d3bafd3e173dfc0bcaab98c802d4f388e572dab9bac532e889d3688456ed8dfab6ee97cee938716a454042daa119f0258b849be1
-EBUILD kodi-visualization-waveform-4.4.0.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
 EBUILD kodi-visualization-waveform-9999.ebuild 901 BLAKE2B 21f656673f5d3c8387a02627ba41fd5d143367ce4d54fea07046f90f9bb72dd3f351ba6db726e9fa8cc5f0ee5673d14e4248699ad2f137754724b6265a04d672 SHA512 c16163543f3d6d8aa88af1cf4e83b0ec2ee992c596fb0501d937abfc651d0efc09fee67325c00484e0067d07a0646d500bf12a594d6aa4c30643dfec4cef52ce
 MISC metadata.xml 371 BLAKE2B 894c191482486b50a429430d2078eb1fb1c5b48d2b5c517385a2fe67f900f841f427f23d69d0b464db4bc54b6b1915953112be2ed6e884bb1d7ab9b18116d75a SHA512 d6723f71fcc2a8b2d4712ed6ffc7d0b5eb65577c3619d5f16d2a1cfed4147c8a8a512c0bfdf9917a0d495a0099f3cae43909aa81c36bf677659f21f7bd33a935
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild
deleted file mode 100644
index e48f1725e4a9..000000000000
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-19.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.waveform"
-KODI_PLUGIN_NAME="visualization.waveform"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.4.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.4.0.ebuild
deleted file mode 100644
index 55c275ff5f4e..000000000000
--- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kodi-addon
-
-DESCRIPTION="Waveform visualizer for Kodi"
-HOMEPAGE="https://github.com/xbmc/visualization.waveform"
-KODI_PLUGIN_NAME="visualization.waveform"
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}.git"
-	inherit git-r3
-	DEPEND="~media-tv/kodi-9999"
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/${KODI_PLUGIN_NAME}/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${KODI_PLUGIN_NAME}-${PV}-${CODENAME}"
-	DEPEND="=media-tv/kodi-19*:="
-	;;
-esac
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND+="
-	>=media-libs/glm-0.9.9.8-r1
-	virtual/opengl
-	"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	if [ -d depends ]; then rm -rf depends || die; fi
-
-	cmake_src_prepare
-}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 441c1b90e2a4..91da46fd9b10 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 746ff5023d42..6fd944f6a01e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,11 +1,9 @@
 AUX kodi-19.4-atomic.patch 3225 BLAKE2B 83559b2886625c3d8b3a4958733c62508e3ca2d538141f061c5d8f8bc681710540c1ce5cffe3184e293d9f8d5e99c1c83cf29d8d4cada9920f3b2f0f756b6c44 SHA512 8d011c9d0caa037f44557a7fd6f745735207fd510b76f53064ee2dbc03e660dfe475586fa4a08fb5308ed0d5133261aae6853c2c7b63d8da4600903f6b232f9a
 AUX kodi-19.4-dav1d-1.0.0.patch 4781 BLAKE2B 1f51f4f89b481b80c384b0567715b7e512c28d26cdfc4572c2e1cf71cba5047bc010d7747b909704804e647cb100144bed0168f4209c602d96146d34fe72c123 SHA512 b16e8f9eefbd1d758f5d38485a0dd29e34478be8e69092ca2a80e182b7a45d3024c58fe80b0fc375eb503bedbf18035a50e695047095311aad2812bde9113ec5
 AUX kodi-19.4-fix-mesa-22.3.0-build.patch 301 BLAKE2B 7a351aa891015524f8377763dd1b9fbe1162c1431131995a75d9acdafa6c500f80ae01b0d2ac82e2be5ac286430cc15c8c2de6901da56c1d22d82d0566160a60 SHA512 e76e9244b97d6c791a18a35dc891b795b062aa4417ff2467930ccf0d4f0be3ef16791bd7c111213527c1cd87a983008ea055d2bb00334e237fb94d58c8057b05
-AUX kodi-19.4-fmt-9.patch 2455 BLAKE2B 02ade8fe11dc19850814b01dd77db9f8f58aa2b9fac56d525c0fcd6e1235fdb3bee251835e6ddb78579e0fd1568f9c1284cbae356188d6998b6aed062f3089d1 SHA512 be32a2413b69b3c1bbc053a328c07bb8b42d84a58a22b0d84da6b0d50cf6d3cb29a509ebb808b4f9e1b3f1bc89ee6aa36dd5ee5685597102c3855aa27dfa724e
 AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-5.1.2-Nexus-Alpha3.tar.gz 14416966 BLAKE2B fe35ef6a9aa2d60a2b34432ae8063850003d550208f223ea43af8ebcaa73e6993639e8cfe8a38676bac79e6b1816bd791b75b66ef58ff4d740bc9a5e0e7f9b78 SHA512 ce60852b8456d6f4bfc60de0ceadb33034d9b3eea8c0bc84d8b7199984ecbf334a2c4d9b42eade439d0ef30ce22e3b2ca0a49d4df837a18cd3136b4343ed3113
-DIST kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9
 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-1.4.3-Next-Nexus-Alpha2.tar.gz 102251 BLAKE2B c7499013a44e81e1aac736f40802db4bc2a8f70664f4d15a81b9c717861894d99a0e2b58ec922ed2f80f9335cc7647b2607daee2a297252827b17075a50ae739 SHA512 a8cc334036888599feaafc7e563ca079a22e52ca3d0a5f5579571f95fe27d22778f390c86b72912a1bacb0ea6b8a6008ff9d47b32383e3eac810e6ba92e8dea1
@@ -13,8 +11,7 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
-EBUILD kodi-19.4-r4.ebuild 11196 BLAKE2B 4029c40f4eaaa745b407599f777ba23dfcc678a4a98fe61b2d32aff26ed96be05286bfb13bc79ab434eaa6131b99b708a170c48bf68aeecd41d400649686eed7 SHA512 af17633390ccad65aa6d64820d7ce8aecaf92cb98f11bcac39b8be52dbd5634cfdec093d9deeabdf38625fbf75f9cbbe1670fd1e2ae0a72df03595fc6027411d
-EBUILD kodi-19.5.ebuild 11222 BLAKE2B 0a740405be55e1f8371c52351950239cbe5c26de5c98201528f877a104ea3459d338e1e731c9c81a632f5dc1f8d0cad6992500562ca0c5e7a7ca75fe7d9c9714 SHA512 23eb906d21bb8a81929bf0aa296a984351d4fbb6f0ef29cc1ef3d8c14fbabd3bcaf5631209b92e160b56708aeb4b2c2bf5aaadbf13addc50e89bf6c5d232caf0
+EBUILD kodi-19.5.ebuild 11221 BLAKE2B 55e98a0d545b789dbcc8161615469a99c657987fc908143b256c935dfd1e773c97822a3559d4c7002e9c2df9dbbf0d8b63732887ed28ce85a708ee23a882da3d SHA512 6759d895812d798d28b7b161b5a35be8a0d2ffb49e553beb952071546a47276770ee1fd6b417fd774a64722167c20505eb6d373e4411c1a642c013cbfc3d2db3
 EBUILD kodi-19.9999.ebuild 10924 BLAKE2B 27199b995e65913ae261fe412a963903e61f19cc49c085a07cb02bec4d780a11e4fa374193c7036b1ed43e29c817e362b5721aa15cadeb85e5bd96729b4d4679 SHA512 34eabe010a72c4aecdc32d0a7dfbbf32a1d6adf28ff3e9431c37890d95a013fb61c4f10d41544f7c253e96eb5b8d091eed06c07bb9cbb671d39d16bf6ee5b6a5
 EBUILD kodi-9999.ebuild 10974 BLAKE2B c1009e74974514d00fbfe052e6ee0391bc9023ea72def84f3d58725789fd75de676305709ae2521ac33ef4f46071241196e5ffc8903186c61253aedc7c35ac67 SHA512 252e2681fdfc41e7fdb5b72a2ad2cce2909bd80b6c355ae7ef5c9d881c7da69d86506316268da7239b9c3d887be23f7b8871c63c9911199439c20a1980eb7774
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
deleted file mode 100644
index b60d9ccc93aa..000000000000
--- a/media-tv/kodi/files/kodi-19.4-fmt-9.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
deleted file mode 100644
index 319a0c88d9f9..000000000000
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2023 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_{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 ~riscv ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-
-PATCHES=(
-	"${FILESDIR}/${P}-fmt-9.patch"
-	"${FILESDIR}/${P}-atomic.patch"
-	"${FILESDIR}/${P}-dav1d-1.0.0.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-0.2.2_p20190529
-	>=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? (
-		media-libs/libva:=
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		wayland? ( media-libs/libva[wayland] )
-		X? ( media-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() {
-	# https://bugs.gentoo.org/885419
-	if has_version ">=media-libs/mesa-22.3.0"; then
-		PATCHES+=( "${FILESDIR}/${P}-fix-mesa-22.3.0-build.patch" )
-	fi
-
-	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/media-tv/kodi/kodi-19.5.ebuild b/media-tv/kodi/kodi-19.5.ebuild
index 3f033734ff91..2a49d55230af 100644
--- a/media-tv/kodi/kodi-19.5.ebuild
+++ b/media-tv/kodi/kodi-19.5.ebuild
@@ -27,7 +27,7 @@ else
 	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 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 	S=${WORKDIR}/xbmc-${MY_PV}
 fi
 
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 8b029b0ea5e7..bf5d4a17e7e2 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest
index d6fec79efefe..17bd8eba3873 100644
--- a/media-video/libva-utils/Manifest
+++ b/media-video/libva-utils/Manifest
@@ -3,6 +3,6 @@ DIST libva-utils-2.18.1.tar.gz 1279583 BLAKE2B 84620e1c9cd24c0cddc4df93e598d858c
 DIST libva-utils-2.18.2.tar.gz 1279586 BLAKE2B 26ba87ef6973cb9960f9a646da9d6467dceb27ce9527d007e92716b4480d3d21711e23cf37f51236da640f6e6eefb421f167e0f87926e966f2f53a699f4110e5 SHA512 cdbf2d542f2d7a442af017a924dd4835f22e367fab89f08ab2beabc535035ed11cdeb2ce581b178ecdb9fd1545fa8fde57b7bc15c8c591cc9c2b5f9ebf572ee7
 EBUILD libva-utils-2.17.1.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
 EBUILD libva-utils-2.18.1.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
-EBUILD libva-utils-2.18.2.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e
+EBUILD libva-utils-2.18.2.ebuild 1887 BLAKE2B af617d30f0280a3db0acd79210fc4a9a87fac15ab625708c334d283213ffe5f195bdffcca9c3f9ce0aa5ad955d7b14f5aac9126ce2d7e7369583a4553832f5df SHA512 b3747cb360cfd2c1f5a39319e9e286d4673afdc3ec4e39155af3d5fea7d680fd0f6faa1f3a7ce67af4cc15a6306afc89daaa710e71a3c34bc973140d3714a98b
 EBUILD libva-utils-9999.ebuild 1891 BLAKE2B 56031d762b08d5f4808003eba8ca7b62d61ae266805007bead8b85f2379f6b72effc0590f7ceb2013b40a24f7324f50fe70dcc052e1a8a070fd9e97eb2f8edec SHA512 f1aaecbcdf93cd3c91be2fd5716ae63175ceb0144d0cb66cbcb8335ec12d6098f5d841f6893c58ccadeb5155771ddfa5be837741a3f23a49ef9a298f4320da0e
 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766
diff --git a/media-video/libva-utils/libva-utils-2.18.2.ebuild b/media-video/libva-utils/libva-utils-2.18.2.ebuild
index f2d6709a0a66..28c1a1ca332c 100644
--- a/media-video/libva-utils/libva-utils-2.18.2.ebuild
+++ b/media-video/libva-utils/libva-utils-2.18.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/intel/libva-utils"
 else
 	SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 56cbbd2d5e2b..143b12f33004 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d0cb68536ef4..f927625aae3b 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 08:39:59 +0000
+Sun, 14 May 2023 14:39:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7ad7a99af27a..6f98806f9ef6 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 543888 BLAKE2B da15fb010da91c403608af1847df77a89c9a8a24b2f5c1999256191c31d7755cd7667c19867e75c2bbdd07063f4ce4dd641cf53415eb08b83e35cbb3d2cd35e2 SHA512 ac5e51b2bf8075889870e4eedfe469274eaf28945ed1e974bc76ae0576dc1aa0db2a5fdacfc15e8cfb28486195fad65b487cf50896a207c5fcad4ffae850adbc
-TIMESTAMP 2023-05-14T08:40:02Z
+TIMESTAMP 2023-05-14T14:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRgnmJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRg8sBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC+3RAAn+SaXvOdEQyggpplgIabmMvi8iG7f7FHCbjO19xf1yK9xS/SjtJIMtID
-hYP2Q6B6X2gsROJN76jpbQJN0hyjnz19qPKoX2Rmfg7SNrl0X6rQOcpqHa+roAeY
-qJVPwQJMyLKiBTohPpgiiX7f3yzqkXh1yHTrwO+OGu9zU3lQoOr7xhJF9Li2x00M
-yiSd7Pp8HiGKQG3viXwXgwVxY1hOGnmFErC+nl1ZeY6n+oXhCp5x+06l59a+fNE2
-WG7qLjQ8ymOmx5XMOftBcZIBjhsSlMuMdBJLaHRdiRepK9E5LcLgIoAPWHVHcWai
-slF+FiXXEeXRw5NNhl9Qd5kxxYQjst4ttAiN0alSMoV8S8MHctr8uhNkP9nUDtcL
-TwSRpSeStYYSQuEHMTSIU7fycBLA+XVjrAN6+02Zd5q3iSkWkDz5FE7sAzDrJsMg
-pPMXhWq7gRmN7/BuiSOMs06POaHFbJDSsaYRkrD1q5x/IxELL06rbeW+5Cylsj3c
-I66mYTXgE2aTtJy8uSAQKPNo5pNOlVgVD1GE7nDueZ85kiNkSahhubUpF6HYfjp/
-y2GGjZtoGrjTPwJQFhk73LVoHmLEFlPpaWGxV3pCJKb9g86GA7MPtXm+BPxZRwle
-M3XGSrs/YmYmeHX3b0x/FHU6kqWd8LulZhPJD91/dh70KR7tWJE=
-=7La/
+klACsxAAk19xQ2nWXKnSOq/OQ04+jook8JAMnzanDmCu7O7XblJqmyIyFth4eRXX
+MBGvhhYvNWMdT9F+Q+PJQ8KvK/8J4gBoLjLrZ3Yl7utRZgBAY19oCkWmfdfETX76
++gJBw2VnOia3PrIWVD4kpEV6Kbw9V9+GJvLfYrxRv1eCTZa/X8sVWU6BVarQ5qfa
+GLrzPogZyqNyRPk5F1ddUjS29gEHogzLO6Fmv3/gB+aNKtHq/XrDoCCOcigQERHW
+MkevMza2f1DBE3lROepKmSCiCeS8C9B9KwaOK70m57b2qq8rK+Dbr9cPTH2lS2AG
+ESXbjYrETmqAFWwuZc4qvzFWgC9wLGvgdlQXguDWdJPi55sAxsD9LcygQvqqExFW
++YNjMM2A24xYeCmXCqlgrHRQbw6LihX0KM7IZNEUbdx239Az7hC2+eARQtwHH5yn
+nddzPEJSkZs/8IbT4OlgjsTe3n/76wdiIp0nGQlbShD66OKasueUoyK1zQ8/4SGK
+KbIZcd3JW+fWeM1ksqOkYR8XwVks8VSkgO0F8xc6CTZBh/s5Uu4SVI7MorUeTwNM
+eVRWnc9P7oO4tWDqXIQ6WMYBJ1U264wLj8g7ZtEeA674py5l4lhsHqlwVBnsbNKt
+Q7Mx4Id+zSCYMKXy4HESEXR7iB36qUcneX12QcJPofmNR2DaaTU=
+=L+Lq
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d0cb68536ef4..f927625aae3b 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 08:39:59 +0000
+Sun, 14 May 2023 14:39:57 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a5ef6a8a8ed8..65b31edf31ed 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index ffbe623f6655..988e3b417900 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/unshield-1.4.3 b/metadata/md5-cache/app-arch/unshield-1.4.3
deleted file mode 100644
index 86476c11d2de..000000000000
--- a/metadata/md5-cache/app-arch/unshield-1.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:0= sys-libs/zlib
-DESCRIPTION=InstallShield CAB file extractor
-EAPI=7
-HOMEPAGE=https://github.com/twogood/unshield
-INHERIT=cmake
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=dev-libs/openssl:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/twogood/unshield/archive/1.4.3.tar.gz -> unshield-1.4.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=be53aae58a6b5161e65bd6fa152aa89a
diff --git a/metadata/md5-cache/app-arch/unshield-1.5.1 b/metadata/md5-cache/app-arch/unshield-1.5.1
index 013abf8eebf8..55fbdc29ddb3 100644
--- a/metadata/md5-cache/app-arch/unshield-1.5.1
+++ b/metadata/md5-cache/app-arch/unshield-1.5.1
@@ -5,10 +5,10 @@ DESCRIPTION=InstallShield CAB file extractor
 EAPI=8
 HOMEPAGE=https://github.com/twogood/unshield
 INHERIT=cmake
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/openssl:0= sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/twogood/unshield/archive/1.5.1.tar.gz -> unshield-1.5.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e8c54d55612d6908e467a6c1f7417fdc
+_md5_=12aed8fe5df733dddc0c770734462827
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index d5b39f110750..ed2a1f5dea26 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-2.2.5 b/metadata/md5-cache/app-backup/rdiff-backup-2.2.5
new file mode 100644
index 000000000000..5105531b99ea
--- /dev/null
+++ b/metadata/md5-cache/app-backup/rdiff-backup-2.2.5
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-libs/librsync-1.0:0= dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+DESCRIPTION=Local/remote mirroring+incremental backup
+EAPI=8
+HOMEPAGE=https://github.com/rdiff-backup/rdiff-backup
+INHERIT=distutils-r1 pypi
+IUSE=python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2
+RDEPEND=dev-python/pylibacl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyxattr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=net-libs/librsync-1.0:0= python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/rdiff-backup/rdiff-backup-2.2.5.tar.gz
+_eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=dc436873b75983d096f5b902b114fe95
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index acad1cc9aa2d..111530845f93 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r18 b/metadata/md5-cache/app-editors/emacs-25.3-r18
index b6dabf5f2e7b..161d1c89e3b9 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r18
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r18
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=acct-group/mail app-emacs/emacs-common[games?,gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-25.3-patches-5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=709cbb6e304e752baff7014149c72e60
+_md5_=a01053242a4312f85ff517d649cfbbe0
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r15 b/metadata/md5-cache/app-editors/emacs-26.3-r15
index 489c8fcaa2c5..512d18a53633 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r15
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r15
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-26.3-patches-5.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5da3b8a1372d22a43afdbc505d47715c
+_md5_=e61eaa2bdb7d9de93c1a8e612327b67d
diff --git a/metadata/md5-cache/app-editors/emacs-27.2-r13 b/metadata/md5-cache/app-editors/emacs-27.2-r13
index a043c8f5b113..5640d6ff641f 100644
--- a/metadata/md5-cache/app-editors/emacs-27.2-r13
+++ b/metadata/md5-cache/app-editors/emacs-27.2-r13
@@ -1,17 +1,17 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 RESTRICT=test
 SLOT=27
 SRC_URI=mirror://gnu/emacs/emacs-27.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-27.2-patches-6.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=082c30c108044b18b9d9a2aa0cc6371b
+_md5_=ac62cbb3f3328331d633bb8148663cef
diff --git a/metadata/md5-cache/app-editors/emacs-28.2-r8 b/metadata/md5-cache/app-editors/emacs-28.2-r8
index c52987617c66..d8e5aede3f45 100644
--- a/metadata/md5-cache/app-editors/emacs-28.2-r8
+++ b/metadata/md5-cache/app-editors/emacs-28.2-r8
@@ -1,16 +1,16 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=28
 SRC_URI=mirror://gnu/emacs/emacs-28.2.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-3.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=463cd57c25f989a483bcab847d4b8971
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6c71768c221f4bf70914bc2f4f4f539a
diff --git a/metadata/md5-cache/app-editors/emacs-28.3_rc1-r2 b/metadata/md5-cache/app-editors/emacs-28.3_rc1-r2
index 16eb278f7a1f..fc0ec2580c2e 100644
--- a/metadata/md5-cache/app-editors/emacs-28.3_rc1-r2
+++ b/metadata/md5-cache/app-editors/emacs-28.3_rc1-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=28
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-28.3-rc1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-28.2-patches-2.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=a14e0b69e37c80e2d8cd3da7d20d072d
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=668db5981a4fe40e6c82ebe8981f9282
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.90 b/metadata/md5-cache/app-editors/emacs-29.0.90
index a781714be966..3dc23b5371b4 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.90
+++ b/metadata/md5-cache/app-editors/emacs-29.0.90
@@ -1,16 +1,16 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29-vcs
 SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-29.0.90.tar.xz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ca5f1818f745ef65590730e0688fa0e2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c2fc2d0d1cd8b8269c5964c57e878d74
diff --git a/metadata/md5-cache/app-editors/emacs-29.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
index 7e59e657362b..fe8a7074960c 100644
--- a/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-29.0.9999-r1
@@ -1,15 +1,15 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs git-r3
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs git-r3
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29-vcs
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ca5f1818f745ef65590730e0688fa0e2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c2fc2d0d1cd8b8269c5964c57e878d74
diff --git a/metadata/md5-cache/app-editors/emacs-30.0.9999 b/metadata/md5-cache/app-editors/emacs-30.0.9999
index 08c7ef2c18c0..ecf30c45f5f6 100644
--- a/metadata/md5-cache/app-editors/emacs-30.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-30.0.9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
+DEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) gui? ( !aqua? ( !gtk? ( x11-base/xorg-proto ) X? ( x11-base/xorg-proto ) ) )
 DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
-INHERIT=autotools elisp-common readme.gentoo-r1 toolchain-funcs git-r3
-IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter webp wide-int +X Xaw3d xft +xpm xwidgets zlib
+INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs git-r3
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 PROPERTIES=live
-RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
+RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=30-vcs
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=97d8688cccf61267f438ccb249f5eaab
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	git-r3	27e13c09a4c7e4c78ac812f74727e676	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=6f790ed94795b1c0a2e36a5063d906a1
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 3fa26c18f70b..342a52438de4 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/libegit2-0.0.20200515-r1 b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
deleted file mode 100644
index 503c02208874..000000000000
--- a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-editors/emacs-26:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-libs/libgit2-1.0.0:=
-DESCRIPTION=Emacs bindings for libgit2
-EAPI=7
-HOMEPAGE=https://github.com/magit/libegit2
-INHERIT=cmake elisp
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libgit2-1.0.0:= >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/magit/libegit2/archive/0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a.tar.gz -> libegit2-0.0.20200515.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d25c4656c1c766092e648447df71eea3
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
deleted file mode 100644
index 4b8f21852869..000000000000
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-editors/emacs-26:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libvterm
-DESCRIPTION=Fully-featured terminal emulator based on libvterm
-EAPI=7
-HOMEPAGE=https://github.com/akermu/emacs-libvterm
-INHERIT=cmake elisp
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
-SLOT=0
-SRC_URI=https://github.com/akermu/emacs-libvterm/archive/d9dfa624679afdd5db6ad25429ef86d3dd91401e.tar.gz -> vterm-0.0.1_pre20210618.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	7190c722d9e06fabcae26ef1e1dc9183	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c166173f7c46a240b71d08ff2319d7fd
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index a5ba21412c3f..3f4022a3f86e 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0 b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
index 95c3bf4e8089..a9d538a81a30 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
+++ b/metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
@@ -10,4 +10,4 @@ RDEPEND=!<app-emulation/libguestfs-1.46.0
 SLOT=0
 SRC_URI=https://download.libguestfs.org/binaries/appliance/appliance-1.46.0.tar.xz
 _eclasses_=check-reqs	a5f1e025c53d62f98bc24bd63d7d95e1
-_md5_=1c0c1b5afd07088ccdac90506cbf4f36
+_md5_=8114735f2ee2236be6ebe7f3c387f92d
diff --git a/metadata/md5-cache/app-emulation/spice-0.15.2 b/metadata/md5-cache/app-emulation/spice-0.15.2
new file mode 100644
index 000000000000..ef1cdf2975e4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/spice-0.15.2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.38:2[static-libs(+)?] dev-libs/openssl:0=[static-libs(+)?] media-libs/opus[static-libs(+)?] media-libs/libjpeg-turbo:0=[static-libs(+)?] sys-libs/zlib[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-emulation/spice-protocol-0.14.3 smartcard? ( app-emulation/qemu[smartcard] ) test? ( net-libs/glib-networking )
+DESCRIPTION=SPICE server
+EAPI=8
+HOMEPAGE=https://www.spice-space.org/
+INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils
+IUSE=gstreamer lz4 sasl smartcard static-libs test
+KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.38:2[static-libs(+)?] dev-libs/openssl:0=[static-libs(+)?] media-libs/opus[static-libs(+)?] media-libs/libjpeg-turbo:0=[static-libs(+)?] sys-libs/zlib[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.spice-space.org/download/releases/spice-server/spice-0.15.2.tar.bz2
+_eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=06cd548e31d21e474564a98de80e6b27
diff --git a/metadata/md5-cache/app-emulation/spice-9999 b/metadata/md5-cache/app-emulation/spice-9999
index 802ff8a0d8a4..3e1fe3e9817c 100644
--- a/metadata/md5-cache/app-emulation/spice-9999
+++ b/metadata/md5-cache/app-emulation/spice-9999
@@ -1,15 +1,15 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) sys-devel/autoconf-archive virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_11(-)] dev-python/six[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst setup test unpack
-DEPEND=dev-lang/orc >=dev-libs/glib-2.38:2 sys-libs/zlib virtual/jpeg:0= >=x11-libs/pixman-0.17.7 dev-libs/openssl:0= lz4? ( app-arch/lz4:0= ) opus? ( media-libs/opus ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ~app-emulation/spice-protocol-9999 smartcard? ( app-emulation/qemu[smartcard] ) test? ( net-libs/glib-networking )
+DEPEND=~app-emulation/spice-protocol-9999 dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.38:2[static-libs(+)?] dev-libs/openssl:0=[static-libs(+)?] media-libs/opus[static-libs(+)?] media-libs/libjpeg-turbo:0=[static-libs(+)?] sys-libs/zlib[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-emulation/spice-protocol-0.14.3 smartcard? ( app-emulation/qemu[smartcard] ) test? ( net-libs/glib-networking )
 DESCRIPTION=SPICE server
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.spice-space.org/
-INHERIT=git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
-IUSE=gstreamer lz4 opus sasl smartcard static-libs test
+INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils git-r3
+IUSE=gstreamer lz4 sasl smartcard static-libs test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-lang/orc >=dev-libs/glib-2.38:2 sys-libs/zlib virtual/jpeg:0= >=x11-libs/pixman-0.17.7 dev-libs/openssl:0= lz4? ( app-arch/lz4:0= ) opus? ( media-libs/opus ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
+RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.38:2[static-libs(+)?] dev-libs/openssl:0=[static-libs(+)?] media-libs/opus[static-libs(+)?] media-libs/libjpeg-turbo:0=[static-libs(+)?] sys-libs/zlib[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-2.5.1 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a71a26e9a3642308c006fb1fd933726e
+_eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=06cd548e31d21e474564a98de80e6b27
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3b2e3f101ee3..9f413f690809 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/lyx-2.3.6.1-r2 b/metadata/md5-cache/app-office/lyx-2.3.6.1-r2
index 517f8f59c28c..fd35b0385968 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.6.1-r2
+++ b/metadata/md5-cache/app-office/lyx-2.3.6.1-r2
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/bc virtual/pkgconfig nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) dev-qt/qtconcurrent:5
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) dev-qt/qtconcurrent:5
 DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc
 EAPI=7
 HOMEPAGE=https://www.lyx.org/
 INHERIT=desktop font python-single-r1 qmake-utils toolchain-funcs xdg-utils
-IUSE=aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he X +python_single_target_python3_10
+IUSE=aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he X python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-REQUIRED_USE=^^ ( python_single_target_python3_10 )
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.6.1.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.6.1/lyx-2.3.6.1.tar.xz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f713cca2f8c474d2c55c4acd58d51d8c
+_md5_=581380c8ee5aa0a1d98faf8e45072334
diff --git a/metadata/md5-cache/app-office/lyx-2.3.7 b/metadata/md5-cache/app-office/lyx-2.3.7
new file mode 100644
index 000000000000..cccd313acbc5
--- /dev/null
+++ b/metadata/md5-cache/app-office/lyx-2.3.7
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc virtual/pkgconfig nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) dev-qt/qtconcurrent:5
+DESCRIPTION=WYSIWYM (What You See Is What You Mean) document processor based on LaTeX
+EAPI=8
+HOMEPAGE=https://www.lyx.org/
+INHERIT=desktop font optfeature python-single-r1 qmake-utils toolchain-funcs xdg-utils
+IUSE=aspell cups debug dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf svg l10n_he X python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] x11-misc/xdg-utils aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:2 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=http://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.7-1.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	font	aa113a3df9cd0a9693a1c1ee7c34a6eb	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=248162f40ed9b1fe5e1790e301aa8b89
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 2c1cc37bab4c..aba23e6aea27 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/foliate-2.6.4-r3 b/metadata/md5-cache/app-text/foliate-2.6.4-r3
new file mode 100644
index 000000000000..8cdfdb574261
--- /dev/null
+++ b/metadata/md5-cache/app-text/foliate-2.6.4-r3
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=gtk ebook reader built with gjs
+EAPI=8
+HOMEPAGE=https://github.com/johnfactotum/foliate/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=meson python-any-r1 plocale xdg gnome2-utils
+IUSE=handy spell
+KEYWORDS=amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/gjs x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] net-libs/webkit-gtk:4.1[introspection] sys-devel/gettext handy? ( gui-libs/libhandy:=[introspection] ) spell? ( app-text/gspell[introspection] )
+SLOT=0
+SRC_URI=https://github.com/johnfactotum/foliate/archive/2.6.4.tar.gz -> foliate-2.6.4.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=179bdc8f7106a092f865a7914595f664
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9ab9da430f86..44d739f6633c 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/igraph-0.9.4 b/metadata/md5-cache/dev-libs/igraph-0.9.4
deleted file mode 100644
index 7a7fa9738796..000000000000
--- a/metadata/md5-cache/dev-libs/igraph-0.9.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
-DESCRIPTION=Creating and manipulating undirected and directed graphs
-EAPI=7
-HOMEPAGE=http://www.igraph.org/
-INHERIT=cmake
-IUSE=debug test threads
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0= dev-libs/libxml2 sci-libs/arpack sci-libs/cxsparse sci-mathematics/glpk:= virtual/blas virtual/lapack
-RESTRICT=!test? ( test )
-SLOT=0/0
-SRC_URI=https://github.com/igraph/igraph/releases/download/0.9.4/igraph-0.9.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=044f3376a26aa157ef313c511d1fc130
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.42.2 b/metadata/md5-cache/dev-libs/libfilezilla-0.42.2
new file mode 100644
index 000000000000..9bfbdae775fc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.42.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install pretend
+DEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:= test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=8
+HOMEPAGE=https://lib.filezilla-project.org/
+INHERIT=flag-o-matic
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.5.7:= virtual/libcrypt:=
+RESTRICT=!test? ( test )
+SLOT=0/35
+SRC_URI=https://download.filezilla-project.org/libfilezilla/libfilezilla-0.42.2.tar.xz
+_eclasses_=flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=aacd0eba2651c63f0fa21df242259686
diff --git a/metadata/md5-cache/dev-libs/librdkafka-2.1.0 b/metadata/md5-cache/dev-libs/librdkafka-2.1.0
new file mode 100644
index 000000000000..e50df84635ec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/librdkafka-2.1.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 )
+DEFINED_PHASES=configure install prepare setup test
+DEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= ) static-libs? ( lz4? ( app-arch/lz4:=[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] ) ssl? ( dev-libs/openssl:0=[static-libs(+)] ) zstd? ( app-arch/zstd:=[static-libs(+)] ) sys-libs/zlib:=[static-libs(+)] )
+DESCRIPTION=Apache Kafka C/C++ client library
+EAPI=8
+HOMEPAGE=https://github.com/edenhill/librdkafka
+INHERIT=python-any-r1 toolchain-funcs
+IUSE=lz4 sasl ssl static-libs zstd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=!static-libs? ( lz4? ( app-arch/lz4:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( dev-libs/openssl:0= ) zstd? ( app-arch/zstd:= ) sys-libs/zlib:= )
+SLOT=0/1
+SRC_URI=https://github.com/edenhill/librdkafka/archive/v2.1.0.tar.gz -> librdkafka-2.1.0.tar.gz
+_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=8b08a6c8b62796dd8bfd5bb655b69fe1
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 05588f43535d..ba402914e805 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
deleted file mode 100644
index 77355b10e72e..000000000000
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=virtual/latex-base media-gfx/imagemagick virtual/texi2dvi test? ( dev-texlive/texlive-langgerman dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/latex2html )
-DESCRIPTION=LaTeX to RTF converter
-EAPI=6
-HOMEPAGE=http://latex2rtf.sourceforge.net/
-INHERIT=toolchain-funcs
-IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base media-gfx/imagemagick
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.11a.tar.gz
-_eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=e3d1fad79d047c93ba6d4bc774022b7e
diff --git a/metadata/md5-cache/dev-tex/latex2rtf-2.3.15 b/metadata/md5-cache/dev-tex/latex2rtf-2.3.15-r1
index f9e76f48ce31..0f96344cf05c 100644
--- a/metadata/md5-cache/dev-tex/latex2rtf-2.3.15
+++ b/metadata/md5-cache/dev-tex/latex2rtf-2.3.15-r1
@@ -1,7 +1,7 @@
+BDEPEND=virtual/latex-base media-gfx/imagemagick virtual/texi2dvi test? ( dev-texlive/texlive-langgerman dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/latex2html )
 DEFINED_PHASES=compile install
-DEPEND=virtual/latex-base media-gfx/imagemagick virtual/texi2dvi test? ( dev-texlive/texlive-langgerman dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-tex/latex2html )
 DESCRIPTION=LaTeX to RTF converter
-EAPI=6
+EAPI=8
 HOMEPAGE=http://latex2rtf.sourceforge.net/
 INHERIT=toolchain-funcs
 IUSE=test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/latex2rtf/latex2rtf-2.3.15.tar.gz
 _eclasses_=multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=47b521789fcc03bdfac56bfded9fb903
+_md5_=1a9376f3f5d05e4ead201d4190ccefc7
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8351724beb3e..6eb2e771fcb4 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/ccache-4.5.1 b/metadata/md5-cache/dev-util/ccache-4.5.1
deleted file mode 100644
index dd965c86afd5..000000000000
--- a/metadata/md5-cache/dev-util/ccache-4.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare prerm test
-DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
-DESCRIPTION=Fast compiler cache
-EAPI=7
-HOMEPAGE=https://ccache.dev/
-INHERIT=cmake toolchain-funcs flag-o-matic
-IUSE=doc redis +static-c++ test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccache/ccache/releases/download/v4.5.1/ccache-4.5.1.tar.xz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c2fbb7510e81e847d260d52bddec90a2
diff --git a/metadata/md5-cache/dev-util/poke-3.2 b/metadata/md5-cache/dev-util/poke-3.2
new file mode 100644
index 000000000000..fdb905107197
--- /dev/null
+++ b/metadata/md5-cache/dev-util/poke-3.2
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig pvm-profiling? ( sys-devel/gcc ) emacs? ( >=app-editors/emacs-23.1:* ) test? ( dev-util/dejagnu nbd? ( sys-block/nbdkit ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=dev-libs/boehm-gc:= dev-libs/libatomic_ops sys-devel/gettext sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) nbd? ( sys-libs/libnbd ) test? ( nbd? ( sys-libs/libnbd[uri-support] ) )
+DESCRIPTION=Extensible editor for structured binary data
+EAPI=8
+HOMEPAGE=https://www.jemarch.net/poke
+INHERIT=elisp-common flag-o-matic toolchain-funcs
+IUSE=emacs pvm-profiling nbd nls test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/boehm-gc:= dev-libs/libatomic_ops sys-devel/gettext sys-libs/readline:= emacs? ( >=app-editors/emacs-23.1:* ) nbd? ( sys-libs/libnbd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/poke/poke-3.2.tar.gz
+_eclasses_=elisp-common	01bc6dc778b74a9deebe4e419a3b790e	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=e069dec734fed50b16a257d2a17047ec
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index d74dbca8c67a..95610e38e957 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/odamex-10.0.0 b/metadata/md5-cache/games-engines/odamex-10.3.0
index 3d349f496cc9..7394d38d53f2 100644
--- a/metadata/md5-cache/games-engines/odamex-10.0.0
+++ b/metadata/md5-cache/games-engines/odamex-10.3.0
@@ -1,6 +1,6 @@
 BDEPEND=games-util/deutex >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
+DEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.2-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
 DESCRIPTION=Online multiplayer free software engine for DOOM
 EAPI=8
 HOMEPAGE=https://odamex.net/
@@ -9,9 +9,9 @@ INHERIT=cmake desktop prefix wxwidgets xdg
 IUSE=+client hidpi master +odalaunch portmidi server upnp X
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ MIT
-RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.0-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
+RDEPEND=client? ( media-libs/libpng:0= media-libs/libsdl2[joystick,sound,video] media-libs/sdl2-mixer net-misc/curl !hidpi? ( x11-libs/fltk:1 ) portmidi? ( media-libs/portmidi ) X? ( x11-libs/libX11 ) ) odalaunch? ( x11-libs/wxGTK:3.2-gtk3[X] ) server? ( dev-libs/jsoncpp:= upnp? ( net-libs/miniupnpc:= ) )
 REQUIRED_USE=|| ( client master server )
 SLOT=0
-SRC_URI=https://github.com/odamex/odamex/releases/download/10.0.0/odamex-src-10.0.0.tar.xz
+SRC_URI=https://github.com/odamex/odamex/releases/download/10.3.0/odamex-src-10.3.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=3ccf7bce1558c51ececc42a7b74d944b
+_md5_=f00c8e38cc3665d38fce5dc1f1a56052
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 338498139d12..4768e256cdd1 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/iosevka-22.1.2 b/metadata/md5-cache/media-fonts/iosevka-22.1.2
new file mode 100644
index 000000000000..8f5b1934686d
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/iosevka-22.1.2
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=install postinst postrm prepare setup
+DESCRIPTION=Slender typeface for code, from code
+EAPI=8
+HOMEPAGE=https://typeof.net/Iosevka/
+INHERIT=font
+IUSE=+iosevka iosevka-ss08 iosevka-ss09 iosevka-ss04 iosevka-ss05 iosevka-ss06 iosevka-ss07 iosevka-ss01 iosevka-ss02 iosevka-ss03 iosevka-aile iosevka-etoile iosevka-ss18 iosevka-ss17 iosevka-ss16 iosevka-ss15 iosevka-ss14 iosevka-ss13 iosevka-ss12 iosevka-ss11 iosevka-ss10 iosevka-curly-slab iosevka-curly iosevka-slab X
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=OFL-1.1
+REQUIRED_USE=|| ( iosevka iosevka-ss08 iosevka-ss09 iosevka-ss04 iosevka-ss05 iosevka-ss06 iosevka-ss07 iosevka-ss01 iosevka-ss02 iosevka-ss03 iosevka-aile iosevka-etoile iosevka-ss18 iosevka-ss17 iosevka-ss16 iosevka-ss15 iosevka-ss14 iosevka-ss13 iosevka-ss12 iosevka-ss11 iosevka-ss10 iosevka-curly-slab iosevka-curly iosevka-slab )
+SLOT=0
+SRC_URI=iosevka? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-22.1.2.zip ) iosevka-ss08? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss08-22.1.2.zip ) iosevka-ss09? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss09-22.1.2.zip ) iosevka-ss04? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss04-22.1.2.zip ) iosevka-ss05? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss05-22.1.2.zip ) iosevka-ss06? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss06-22.1.2.zip ) iosevka-ss07? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss07-22.1.2.zip ) iosevka-ss01? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss01-22.1.2.zip ) iosevka-ss02? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss02-22.1.2.zip ) iosevka-ss03? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss03-22.1.2.zip ) iosevka-aile? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-aile-22.1.2.zip ) iosevka-etoile? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-etoile-22.1.2.zip ) iosevka-ss18? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss18-22.1.2.zip ) iosevka-ss17? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss17-22.1.2.zip ) iosevka-ss16? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss16-22.1.2.zip ) iosevka-ss15? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss15-22.1.2.zip ) iosevka-ss14? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss14-22.1.2.zip ) iosevka-ss13? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss13-22.1.2.zip ) iosevka-ss12? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss12-22.1.2.zip ) iosevka-ss11? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss11-22.1.2.zip ) iosevka-ss10? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-ss10-22.1.2.zip ) iosevka-curly-slab? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-curly-slab-22.1.2.zip ) iosevka-curly? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-curly-22.1.2.zip ) iosevka-slab? ( https://github.com/be5invis/Iosevka/releases/download/v22.1.2/super-ttc-iosevka-slab-22.1.2.zip )
+_eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
+_md5_=5044ef057efbfd151c32dbf6ba31cae9
diff --git a/metadata/md5-cache/media-fonts/noto-20201226 b/metadata/md5-cache/media-fonts/noto-20230430
index 06386efda0ab..80527e979643 100644
--- a/metadata/md5-cache/media-fonts/noto-20201226
+++ b/metadata/md5-cache/media-fonts/noto-20230430
@@ -1,15 +1,15 @@
 BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DEFINED_PHASES=install postinst postrm setup
 DESCRIPTION=Google's font family that aims to support all the world's languages
-EAPI=7
-HOMEPAGE=https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts
+EAPI=8
+HOMEPAGE=https://www.google.com/get/noto/ https://github.com/notofonts/notofonts.github.io
 INHERIT=font
 IUSE=cjk +extra X
-KEYWORDS=~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=OFL-1.1
 RDEPEND=cjk? ( media-fonts/noto-cjk )
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=https://github.com/googlei18n/noto-fonts/archive/2b1fbc36600ccd8becb9f894922f644bff2cbc9b.tar.gz -> noto-20201226.tar.gz
+SRC_URI=https://github.com/notofonts/notofonts.github.io/archive/8f03a57b371df199e1c73b2bd5d342fbbe4ce840.tar.gz -> noto-20230430.tar.gz
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=18854211f4dfe3c4276b418e946810ec
+_md5_=88f489d12ff30eb3bb65412505ae40a6
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index abc82918261e..b24c2955feee 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/kcolorpicker-0.1.6 b/metadata/md5-cache/media-libs/kcolorpicker-0.1.6
deleted file mode 100644
index 8090063f4b52..000000000000
--- a/metadata/md5-cache/media-libs/kcolorpicker-0.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5[png] test? ( dev-qt/qttest:5 )
-DESCRIPTION=Qt based color picker with popup menu
-EAPI=7
-HOMEPAGE=https://github.com/ksnip/kColorPicker
-INHERIT=cmake virtualx
-IUSE=test test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5[png]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ksnip/kColorPicker/archive/v0.1.6.tar.gz -> kColorPicker-0.1.6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fccf5b5d98289b35b88a373e09f019cc
diff --git a/metadata/md5-cache/media-libs/kcolorpicker-0.2.0 b/metadata/md5-cache/media-libs/kcolorpicker-0.2.0
index 0b2344495e76..0233827d0c5b 100644
--- a/metadata/md5-cache/media-libs/kcolorpicker-0.2.0
+++ b/metadata/md5-cache/media-libs/kcolorpicker-0.2.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ksnip/kColorPicker
 INHERIT=cmake virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5[png]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ksnip/kColorPicker/archive/v0.2.0.tar.gz -> kColorPicker-0.2.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=04a0fb891a34a766603933a8741fc39c
+_md5_=a3a119380bf330b8cdb908aa4bdbfee9
diff --git a/metadata/md5-cache/media-libs/kimageannotator-0.5.3 b/metadata/md5-cache/media-libs/kimageannotator-0.5.3
deleted file mode 100644
index 49baa35cec22..000000000000
--- a/metadata/md5-cache/media-libs/kimageannotator-0.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] >=media-libs/kcolorpicker-0.1.6 x11-libs/libX11 test? ( dev-qt/qttest:5 )
-DESCRIPTION=Tool for annotating images
-EAPI=8
-HOMEPAGE=https://github.com/ksnip/kImageAnnotator
-INHERIT=cmake virtualx
-IUSE=test test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] >=media-libs/kcolorpicker-0.1.6 x11-libs/libX11
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ksnip/kImageAnnotator/archive/v0.5.3.tar.gz -> kImageAnnotator-0.5.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=38de74ad6484c0facc7272d28fa714f3
diff --git a/metadata/md5-cache/media-libs/kimageannotator-0.6.0 b/metadata/md5-cache/media-libs/kimageannotator-0.6.0
index 64546f9c1f95..53f7bad692b4 100644
--- a/metadata/md5-cache/media-libs/kimageannotator-0.6.0
+++ b/metadata/md5-cache/media-libs/kimageannotator-0.6.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ksnip/kImageAnnotator
 INHERIT=cmake virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5[png] >=media-libs/kcolorpicker-0.2.0 x11-libs/libX11
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ksnip/kImageAnnotator/archive/v0.6.0.tar.gz -> kImageAnnotator-0.6.0.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d8281a21636dbb7e339354b264a4b493
+_md5_=b2c4d617f5e518e284b276ed968ab12e
diff --git a/metadata/md5-cache/media-libs/mesa-23.1.0 b/metadata/md5-cache/media-libs/mesa-23.1.0
index 99c157ce3032..e5cf9ddd0e6e 100644
--- a/metadata/md5-cache/media-libs/mesa-23.1.0
+++ b/metadata/md5-cache/media-libs/mesa-23.1.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.0.0 || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=>=dev-util/meson-1.0.0 || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang video_cards_intel? ( amd64? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install pretend setup test
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( video_cards_intel? ( amd64? ( dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 ) ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) vulkan? ( video_cards_intel? ( dev-util/spirv-llvm-translator:16 ) ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) vulkan? ( video_cards_intel? ( dev-util/spirv-llvm-translator:15 ) ) ) ) !opencl? ( <sys-devel/llvm-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-23.1.0.tar.xz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=d14fef94afc2e5718b848038b2ce23c5
+_md5_=6dc6b4e50ec1c8941a4eb5be35132738
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index 44ead02fe40e..d0dcbd8f12b1 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/meson-1.0.0 || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/meson-1.0.0 || ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 ) opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ) vulkan? ( dev-util/glslang video_cards_intel? ( amd64? ( || ( ( >=dev-lang/python-3.11.1-r1:3.11 dev-python/ply[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/ply[python_targets_python3_10(-)] ) ) ) ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install pretend setup test unpack
 DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3 dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 virtual/libelf:0= ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( video_cards_intel? ( amd64? ( dev-libs/libclc[spirv(-)] >=dev-util/spirv-tools-1.3.231.0 ) ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( || ( ( !opencl? ( sys-devel/llvm:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:16[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:16 ) vulkan? ( video_cards_intel? ( dev-util/spirv-llvm-translator:16 ) ) ) ( !opencl? ( sys-devel/llvm:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( sys-devel/clang:15[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-util/spirv-llvm-translator:15 ) vulkan? ( video_cards_intel? ( dev-util/spirv-llvm-translator:15 ) ) ) ) !opencl? ( <sys-devel/llvm-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( <sys-devel/clang-17:=[llvm_targets_AMDGPU(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
@@ -13,4 +13,4 @@ REQUIRED_USE=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 vi
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	llvm	4cc6f8e29d24a8011266413e74c728bb	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f33e1c1cb00f7504aaa4ba0aed9ce2f4
+_md5_=a48e679245592775339ff92f1285f629
diff --git a/metadata/md5-cache/media-libs/vigra-1.11.1-r8 b/metadata/md5-cache/media-libs/vigra-1.11.1-r8
deleted file mode 100644
index 0ab7578de41f..000000000000
--- a/metadata/md5-cache/media-libs/vigra-1.11.1-r8
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-python/nose-1.1.2-r1[python_targets_python3_10(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=fftw? ( sci-libs/fftw:3.0= ) hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( media-libs/libjpeg-turbo:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) dev-libs/boost:=[python?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_10(-)?] ) tiff? ( media-libs/tiff:= ) zlib? ( sys-libs/zlib )
-DESCRIPTION=C++ computer vision library emphasizing customizable algorithms and structures
-EAPI=7
-HOMEPAGE=https://ukoethe.github.io/vigra/
-INHERIT=cmake flag-o-matic python-r1
-IUSE=doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff +zlib python_targets_python3_10
-KEYWORDS=amd64 arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) jpeg? ( media-libs/libjpeg-turbo:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) png? ( media-libs/libpng:0= ) python? ( python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+),xml(+)] ) dev-libs/boost:=[python?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_10(-)?] ) tiff? ( media-libs/tiff:= ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=python? ( hdf5 || ( python_targets_python3_10 ) ) test? ( hdf5 python fftw )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4b603a50d774b6c3c16b3bd1e761ef68
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 423198926927..9fcfbbe8be79 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0-r1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0-r1
deleted file mode 100644
index 6886d1ca50cb..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-3.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac:=
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 media-libs/flac:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-flac-3.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c9269b05d8505b01eefd6a6fd9b1a4bc
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.2
deleted file mode 100644
index 69f5679f8b0d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
-DESCRIPTION=Lame MP3 encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.lame
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-sound/lame-3.100
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/3.0.2-Matrix.tar.gz -> kodi-audioencoder-lame-3.0.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=25eba38c709604c823e45235fac6710c
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
deleted file mode 100644
index e3fa037e0b8e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/3.0.1-Matrix.tar.gz -> kodi-audioencoder-vorbis-3.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=49d921238bae7eee1b0711a4132007d0
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
deleted file mode 100644
index bace8568e7ea..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=WAV encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.wav
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/3.0.0-Matrix.tar.gz -> kodi-audioencoder-wav-3.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1ae135ec47c89c09900fb17fcf3a935d
diff --git a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0 b/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0
deleted file mode 100644
index 1f7df47ea547..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-game-libretro-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=7
-HOMEPAGE=https://github.com/kodi-game/game.libretro
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-game/game.libretro/archive/2.2.0-Matrix.tar.gz -> kodi-game-libretro-2.2.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=12078c24f0e0791b35bcc8ef557aa05b
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
deleted file mode 100644
index e641d79dd6ab..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
-DESCRIPTION=HEIF image decoder for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.5 >=media-libs/libheif-1.6.2
-SLOT=0
-SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.3.0-Matrix.tar.gz -> kodi-imagedecoder-heif-1.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=49e1ad9883808d8e8544c910cae78a1d
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0
deleted file mode 100644
index 6bc2437288fa..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-heif-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
-DESCRIPTION=HEIF image decoder for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/imagedecoder.heif
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libde265-1.0.8 >=media-libs/libheif-1.6.2
-SLOT=0
-SRC_URI=https://github.com/xbmc/imagedecoder.heif/archive/1.4.0-Matrix.tar.gz -> kodi-imagedecoder-heif-1.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0bd5fd15327394a53d5f464e2a221326
diff --git a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1 b/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
deleted file mode 100644
index 555a512dc6b1..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-imagedecoder-raw-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* >=media-libs/libraw-0.19.5[jpeg,lcms] >=media-libs/lcms-2.9
-DESCRIPTION=RAW image decoder for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/imagedecoder.raw
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19* >=media-libs/libraw-0.19.5[jpeg,lcms] >=media-libs/lcms-2.9
-SLOT=0
-SRC_URI=https://github.com/xbmc/imagedecoder.raw/archive/3.0.1-Matrix.tar.gz -> kodi-imagedecoder-raw-3.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=064c37ae7c4b8fc3b8845b34cafda8ba
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1
deleted file mode 100644
index 0c9ba96fa470..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/3.1.1-Matrix.tar.gz -> kodi-inputstream-rtmp-3.1.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.3.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.3.0
deleted file mode 100644
index 5d70249e4567..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/3.3.0-Matrix.tar.gz -> kodi-inputstream-rtmp-3.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.4.0 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.4.0
deleted file mode 100644
index c773c70c74e2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= media-video/rtmpdump[ssl]
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/3.4.0-Matrix.tar.gz -> kodi-inputstream-rtmp-3.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=51aa8e0d6e6ce35ea74895abb738758c
diff --git a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.2 b/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.2
deleted file mode 100644
index ef55b99ab103..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-peripheral-joystick-1.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
-DESCRIPTION=Libretro compatibility layer for the Kodi Game API
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/peripheral.joystick
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/libpcre dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/xbmc/peripheral.joystick/archive/1.7.2-Matrix.tar.gz -> kodi-peripheral-joystick-1.7.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd45399c680119538f4f5f7a37b713e2
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
deleted file mode 100644
index 09e0e3808dff..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/jsoncpp
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-argustv-6.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f26c506c599eb92a6556e98c93155378
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
deleted file mode 100644
index c8795a66152a..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-6.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/6.0.2-Matrix.tar.gz -> kodi-pvr-argustv-6.0.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b1db694c1500dc9e59bbc7c46991f170
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.0.0
deleted file mode 100644
index c45669af6527..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-argustv-7.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b1db694c1500dc9e59bbc7c46991f170
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.1
deleted file mode 100644
index 094316bd1849..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-argustv-7.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's ARGUS TV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.argustv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.argustv/archive/7.1.1-Matrix.tar.gz -> kodi-pvr-argustv-7.1.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7fa9b9e33616a2eae5c74104806777b1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.3 b/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.3
deleted file mode 100644
index b41bccbdae0c..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-demo-7.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Demo PVR for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.demo
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.demo/archive/7.1.3-Matrix.tar.gz -> kodi-pvr-demo-7.1.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ade8c58ea09056b637c7f963f6d6f9f9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
deleted file mode 100644
index 021a9737adad..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/8.0.0-Matrix.tar.gz -> kodi-pvr-dvblink-8.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=13543830c91c73f559baac3d4ca04038
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.0
deleted file mode 100644
index baf808eefc94..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/9.0.0-Matrix.tar.gz -> kodi-pvr-dvblink-9.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=13543830c91c73f559baac3d4ca04038
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.1
deleted file mode 100644
index ba25b8b73bdc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvblink-9.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's DVBLink client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvblink
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvblink/archive/9.0.1-Matrix.tar.gz -> kodi-pvr-dvblink-9.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=317139f0439721b2334645993751bfd0
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
deleted file mode 100644
index 7d06aa6d4792..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/6.0.6-Matrix.tar.gz -> kodi-pvr-dvbviewer-6.0.6-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d056bb44c05330ffe4a0387fda8750d5
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.7 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.7
deleted file mode 100644
index fc752ecaa316..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-6.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/6.0.7-Matrix.tar.gz -> kodi-pvr-dvbviewer-6.0.7-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1ce3626215ce0e9d496f3de3f64aff22
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.0.0
deleted file mode 100644
index 1d8305406e63..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.0.0-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1ce3626215ce0e9d496f3de3f64aff22
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.1.0 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.1.0
deleted file mode 100644
index edf0cb9fffdf..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.1.0-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.1.0-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1ce3626215ce0e9d496f3de3f64aff22
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.1
deleted file mode 100644
index 161a57e31627..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.1-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.1-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2 b/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2
deleted file mode 100644
index 602668603ea5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-7.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's DVBViewer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.dvbviewer
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.dvbviewer/archive/7.3.2-Matrix.tar.gz -> kodi-pvr-dvbviewer-7.3.2-Matrix.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9b58362aff7ed1977336ae4e5797d5cf
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
deleted file mode 100644
index 3d0adb90cd09..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-5.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/5.1.0-Matrix.tar.gz -> kodi-pvr-filmon-5.1.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5ab0d56942da68f9688a8948e96db8b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.0.0
deleted file mode 100644
index 7f8bae5e59f4..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-filmon-6.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a5ab0d56942da68f9688a8948e96db8b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.1
deleted file mode 100644
index 72f7e1310155..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-filmon-6.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's Filmon client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.filmon
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.filmon/archive/6.1.1-Matrix.tar.gz -> kodi-pvr-filmon-6.1.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=431ff8674f3d1d36a464011034d02c13
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.0 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.0
deleted file mode 100644
index 11adfdff35fd..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.0-Matrix.tar.gz -> kodi-pvr-hts-8.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1
deleted file mode 100644
index 8da46d9b8539..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.1-Matrix.tar.gz -> kodi-pvr-hts-8.3.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.2 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.2
deleted file mode 100644
index c70cbdea9117..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.2-Matrix.tar.gz -> kodi-pvr-hts-8.3.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3
deleted file mode 100644
index 7cf89d88fe99..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.3-Matrix.tar.gz -> kodi-pvr-hts-8.3.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.4 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.4
deleted file mode 100644
index 8d6e76ee8619..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-hts-8.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*
-DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/8.3.4-Matrix.tar.gz -> kodi-pvr-hts-8.3.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0274b4aa1c101f5bdf26f9c0adc9830c
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.5 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.5
deleted file mode 100644
index ed7b621b0897..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.5-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.5.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.6 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.6
deleted file mode 100644
index 8dfd4c080ade..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.6-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.7 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.7
deleted file mode 100644
index 54ae776905fd..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.7-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.7.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8 b/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8
deleted file mode 100644
index 823c5fb1b514..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-7.6.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-DESCRIPTION=Kodi's IPTVSimple client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.iptvsimple
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/pugixml =media-tv/kodi-19* sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.iptvsimple/archive/7.6.8-Matrix.tar.gz -> kodi-pvr-iptvsimple-7.6.8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=83333caae1b7f093080ef3a8cd465654
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.0 b/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.0
deleted file mode 100644
index d08284fbffaa..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-mediaportal-tvserver-8.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's MediaPortal TVServer client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.mediaportal.tvserver
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/8.2.0-Matrix.tar.gz -> kodi-pvr-mediaportal-tvserver-8.2.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=fd8fcc7662099393dcc030866f97a248
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.3 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.3
deleted file mode 100644
index a5484aa20009..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.3-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.4 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.4
deleted file mode 100644
index 4609d1e7b7e5..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.4-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.5 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.5
deleted file mode 100644
index f49609a865bf..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-8.2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's NextPVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/8.2.5-Matrix.tar.gz -> kodi-pvr-nextpvr-8.2.5.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ca4c53900186dc3ef139139d913d7f48
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
deleted file mode 100644
index 66da43a07979..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-njoy-6.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a15f8e055149f9dd79d39c2461fd20b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.0.0
deleted file mode 100644
index e47c4bf2b022..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-njoy-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml
-DESCRIPTION=Kodi's Njoy N7 client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.njoy
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.njoy/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-njoy-7.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=9a15f8e055149f9dd79d39c2461fd20b
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
deleted file mode 100644
index 0a9b6383de50..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's PCTV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/5.0.0-Matrix.tar.gz -> kodi-pvr-pctv-5.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b40cb56ee49aad293d1dd5662c585897
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.0.0
deleted file mode 100644
index d7d7760cfcbf..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-pctv-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-DESCRIPTION=Kodi's PCTV client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.pctv
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.pctv/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-pctv-6.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b40cb56ee49aad293d1dd5662c585897
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
deleted file mode 100644
index 5a8f5a2b2849..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.0-Matrix.tar.gz -> kodi-pvr-stalker-6.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=11fd1952b8bfecfb6df8c36c53f2606f
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1
deleted file mode 100644
index 26eb5e566121..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.1-Matrix.tar.gz -> kodi-pvr-stalker-6.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a35e639fdba029ce4751fca42bead41
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2
deleted file mode 100644
index 8878e031c444..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-6.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/6.0.2-Matrix.tar.gz -> kodi-pvr-stalker-6.0.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a35e639fdba029ce4751fca42bead41
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.0.0
deleted file mode 100644
index b5497679f331..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-stalker-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-DESCRIPTION=Kodi's Stalker client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.stalker
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/jsoncpp dev-libs/tinyxml
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.stalker/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-stalker-7.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a35e639fdba029ce4751fca42bead41
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
deleted file mode 100644
index 6f5fa1ef3deb..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2 =dev-libs/libplatform-2*
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2 =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.0-Matrix.tar.gz -> kodi-pvr-vbox-7.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99faadace00664867833ff3030aa59c1
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.1
deleted file mode 100644
index 6933308490d2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.1-Matrix.tar.gz -> kodi-pvr-vbox-7.0.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c74970ca991f9e2dc8b99472e8f22aa
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.2
deleted file mode 100644
index 0ea804927515..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.2-Matrix.tar.gz -> kodi-pvr-vbox-7.0.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c74970ca991f9e2dc8b99472e8f22aa
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3
deleted file mode 100644
index ee2652fe6240..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-7.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/7.0.3-Matrix.tar.gz -> kodi-pvr-vbox-7.0.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c74970ca991f9e2dc8b99472e8f22aa
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.0.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.0.0
deleted file mode 100644
index 0c1ce60f285d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/8.0.0-Matrix.tar.gz -> kodi-pvr-vbox-8.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=4c74970ca991f9e2dc8b99472e8f22aa
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.1
deleted file mode 100644
index b27de2a6852d..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vbox-8.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-DESCRIPTION=Kodi's VBox Home TV Gateway PVR client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vbox
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml2
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vbox/archive/8.1.1-Matrix.tar.gz -> kodi-pvr-vbox-8.1.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0596d478586d35c389fe983899e5270a
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.3
deleted file mode 100644
index f741a736f9ba..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-19.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* virtual/opengl
-DESCRIPTION=Kodi PVR addon VNSI
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/19.0.3-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-19.0.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=857d3c70e92a5064364986048cf5aff9
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.2 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.2
deleted file mode 100644
index 0f86de514621..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* virtual/opengl
-DESCRIPTION=Kodi PVR addon VNSI
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/8.2.2-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-8.2.2.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b5717660b7be0de3fc6bd2440d5e02ae
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.3
deleted file mode 100644
index 1c38203c49a9..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* virtual/opengl
-DESCRIPTION=Kodi PVR addon VNSI
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vdr.vnsi
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/8.2.3-Matrix.tar.gz -> kodi-pvr-vdr-vnsi-8.2.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b5717660b7be0de3fc6bd2440d5e02ae
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.3
deleted file mode 100644
index d5b9748a24b8..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.3-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.3.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.4 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.4
deleted file mode 100644
index 6d561681eafc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.4-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.4.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5
deleted file mode 100644
index 0d1504199e32..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.5-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.5.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7
deleted file mode 100644
index 5ab8da962718..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.7-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.7.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.8 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.8
deleted file mode 100644
index 2e91abeb8dfb..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.8-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.8.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.1 b/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.1
deleted file mode 100644
index 88ea960ba3bb..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
-DESCRIPTION=Kodi's Windows Media Center client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.wmc
-INHERIT=cmake kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* =dev-libs/libplatform-2*
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.wmc/archive/6.1.1-Matrix.tar.gz -> kodi-pvr-wmc-6.1.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=dc7ad21c98b3a7f1ba483e16ab11ab6d
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0
deleted file mode 100644
index 0e9cff791a51..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-fishbmc-6.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Fische visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.fishbmc
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.fishbmc/archive/6.3.0-Matrix.tar.gz -> kodi-visualization-fishbmc-6.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ebbbd8aca8ace586546a901a28f869fe
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0
deleted file mode 100644
index b0dc37d53e2f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-goom-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Goom visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.goom
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.goom/archive/3.4.0-Matrix.tar.gz -> kodi-visualization-goom-3.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=541fee7b3aecb0c9dfa7618105154f9c
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.0
deleted file mode 100644
index 19cb20699c79..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.12:=
-DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.projectm
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.12:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.projectm/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-projectm-19.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b5a547f833dfbaafe29d47a463f143f1
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0 b/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0
deleted file mode 100644
index 333678070953..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-projectm-3.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
-DESCRIPTION=ProjectM visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.projectm
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= virtual/opengl >=media-libs/libprojectm-3.1.2:=
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.projectm/archive/3.3.0-Matrix.tar.gz -> kodi-visualization-projectm-3.3.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=83928399c16be07c5ce8fff252567456
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0
deleted file mode 100644
index 786d45efb604..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-spectrum-3.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Spectrum visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.spectrum
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.spectrum/archive/3.4.0-Matrix.tar.gz -> kodi-visualization-spectrum-3.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=79d8e2ef4139d44fc2cd352db5c6c72b
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1
deleted file mode 100644
index 31325cb1be79..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=StarBurst visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.starburst
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.3.1-Matrix.tar.gz -> kodi-visualization-starburst-2.3.1.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0
deleted file mode 100644
index 09b187aa2334..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-starburst-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=StarBurst visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.starburst
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.starburst/archive/2.4.0-Matrix.tar.gz -> kodi-visualization-starburst-2.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=edcdcc5756db5db55d9f4b55231a7034
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0
deleted file mode 100644
index d01ad7503a93..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-19.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Waveform visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.waveform
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.waveform/archive/19.0.0-Matrix.tar.gz -> kodi-visualization-waveform-19.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=424b3709ea4597ab5419ea92d1a74262
diff --git a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0 b/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0
deleted file mode 100644
index 78f313325578..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-visualization-waveform-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-DESCRIPTION=Waveform visualizer for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/visualization.waveform
-INHERIT=kodi-addon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND==media-tv/kodi-19*:= >=media-libs/glm-0.9.9.8-r1 virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/xbmc/visualization.waveform/archive/4.4.0-Matrix.tar.gz -> kodi-visualization-waveform-4.4.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	kodi-addon	443aa411bb9c2ea5c45516ea33e273d1	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=74dacc948ce3c07cfdd8b0b64323818f
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 86a7cc46eeb7..68962bee4295 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-r4 b/metadata/md5-cache/media-tv/kodi-19.4-r4
deleted file mode 100644
index 73a0bc253d48..000000000000
--- a/metadata/md5-cache/media-tv/kodi-19.4-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-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-r5 >=sys-devel/libtool-2.4.7 >=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_10? ( >=dev-lang/python-3.10.9-r1: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-0.2.2_p20190529 >=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_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? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-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 libtool 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_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~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_10? ( >=dev-lang/python-3.10.9-r1: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-0.2.2_p20190529 >=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_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? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-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_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	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8572bd5e563320e36a5c50024c30cc2b
diff --git a/metadata/md5-cache/media-tv/kodi-19.5 b/metadata/md5-cache/media-tv/kodi-19.5
index 2c2730dd6ff2..b621cfcee622 100644
--- a/metadata/md5-cache/media-tv/kodi-19.5
+++ b/metadata/md5-cache/media-tv/kodi-19.5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 INHERIT=autotools cmake desktop libtool 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_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv 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_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,ssl] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[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-0.2.2_p20190529 >=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_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) >=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? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-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_10 python_single_target_python3_11 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
@@ -14,4 +14,4 @@ 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.5-Matrix.tar.gz -> kodi-19.5-Matrix.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=bde8d81ba5b190bac7d78a92ac56041f
+_md5_=aafca5e059e3807b410c0ee066cffa2d
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 02a41eb7ad51..ec7a4d7fa114 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/libva-utils-2.18.2 b/metadata/md5-cache/media-video/libva-utils-2.18.2
index 6872482686f9..df4199d5f466 100644
--- a/metadata/md5-cache/media-video/libva-utils-2.18.2
+++ b/metadata/md5-cache/media-video/libva-utils-2.18.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson
 IUSE=examples putsurface test +vainfo wayland X
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) >=media-libs/libva-2.18.0:=[wayland?,X?]
 REQUIRED_USE=putsurface? ( || ( wayland X ) ) || ( examples putsurface test vainfo )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/intel/libva-utils/archive/2.18.2.tar.gz -> libva-utils-2.18.2.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=5719d6f22ecfb1cb51ab4ea9ec631a16
+_md5_=8ad136d71db4c1911325407844aa4854
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 1f035cbfdf70..e7b21fa3ce87 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.10.1-r1 b/metadata/md5-cache/net-fs/cvmfs-2.10.1-r1
index e4b765bcd0a2..e7668959bb7d 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.10.1-r1
+++ b/metadata/md5-cache/net-fs/cvmfs-2.10.1-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://cernvm.cern.ch/fs/
 INHERIT=cmake linux-info bash-completion-r1
 IUSE=server
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= dev-libs/leveldb:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.10.1/source.tar.gz -> cvmfs-2.10.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7a24e7433befb13a980447b1aacecfe4
+_md5_=4d8754fe52c54605c9dfe8853f04ff04
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 7a8a3db8b1fb..5fc7ad7d7016 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/filezilla-3.64.0 b/metadata/md5-cache/net-ftp/filezilla-3.64.0
new file mode 100644
index 000000000000..bd5981b7b338
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/filezilla-3.64.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.42.2:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 x11-libs/wxGTK:3.2-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) test? ( >=dev-util/cppunit-1.13.0 )
+DESCRIPTION=FTP client with lots of useful features and an intuitive interface
+EAPI=8
+HOMEPAGE=https://filezilla-project.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools wxwidgets xdg
+IUSE=dbus nls test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/nettle-3.1:= >=dev-db/sqlite-3.7 >=dev-libs/libfilezilla-0.42.2:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 x11-libs/wxGTK:3.2-gtk3[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.filezilla-project.org/client/FileZilla_3.64.0_src.tar.xz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=b0319dd392add162ec71857494cca114
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 1f7b49df67ab..622d5c1c35d6 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/grpc-1.52.1 b/metadata/md5-cache/net-libs/grpc-1.52.1
index c247167e7afe..cd32f26c05e4 100644
--- a/metadata/md5-cache/net-libs/grpc-1.52.1
+++ b/metadata/md5-cache/net-libs/grpc-1.52.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.grpc.io
 INHERIT=cmake
 IUSE=doc examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND==dev-cpp/abseil-cpp-20220623.1*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-3.18.1:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:=
 RESTRICT=test
 SLOT=0/30.152
 SRC_URI=https://github.com/grpc/grpc/archive/v1.52.1.tar.gz -> grpc-1.52.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d0e871ba4e8054e02e18452cc8025ce1
+_md5_=8168beb33cd82e96009676dc78c4a982
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 4e05b9b45193..b099b8766418 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/ytnef-2.1.1 b/metadata/md5-cache/net-mail/ytnef-2.1.1
new file mode 100644
index 000000000000..bff16e51bd03
--- /dev/null
+++ b/metadata/md5-cache/net-mail/ytnef-2.1.1
@@ -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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-devel/libtool
+DESCRIPTION=Yeraze's TNEF Stream Reader - for winmail.dat files
+EAPI=8
+HOMEPAGE=https://github.com/Yeraze/ytnef
+INHERIT=autotools
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-perl/MIME-tools
+SLOT=0
+SRC_URI=https://github.com/Yeraze/ytnef/archive/v2.1.1.tar.gz -> ytnef-2.1.1.tar.gz
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=b1d3b586fafd0596a577913a90178231
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 6fe881b5f1a6..a216797c62ab 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2 b/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
deleted file mode 100644
index 9c318509563b..000000000000
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig jsonapi? ( || ( >=app-doc/doxygen-1.8.17 <app-doc/doxygen-1.8.16 ) )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
-DEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/miniupnpc:= sys-libs/zlib control-socket? ( dev-qt/qtnetwork:5 ) gnome-keyring? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) webui? ( net-libs/libmicrohttpd ) xapian? ( dev-libs/xapian ) dev-qt/qtcore:5 gui? ( dev-qt/designer:5 )
-DESCRIPTION=P2P private sharing application
-EAPI=7
-HOMEPAGE=https://retroshare.cc
-INHERIT=desktop edos2unix qmake-utils xdg-utils
-IUSE=cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3
-RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/miniupnpc:= sys-libs/zlib control-socket? ( dev-qt/qtnetwork:5 ) gnome-keyring? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) webui? ( net-libs/libmicrohttpd ) xapian? ( dev-libs/xapian )
-REQUIRED_USE=|| ( cli gui service ) service? ( jsonapi )
-SLOT=0
-SRC_URI=https://github.com/RetroShare/RetroShare/releases/download/v0.6.5/RetroShare-v0.6.5-source-with-submodules.tar.gz -> retroshare-0.6.5.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	104e1332efb829e2f7cbf89307a474f1	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c42f307d7409e7f975784e411639ce7a
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r3 b/metadata/md5-cache/net-p2p/retroshare-0.6.5-r3
deleted file mode 100644
index 7d7575b9753a..000000000000
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.5-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig jsonapi? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend
-DEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/miniupnpc:= sys-libs/zlib autologin? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) dev-qt/qtcore:5 gui? ( dev-qt/designer:5 )
-DESCRIPTION=P2P private sharing application
-EAPI=7
-HOMEPAGE=https://retroshare.cc
-INHERIT=desktop edos2unix qmake-utils xdg-utils
-IUSE=autologin +gui +jsonapi +service +sqlcipher
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3
-RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 net-libs/miniupnpc:= sys-libs/zlib autologin? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( gui service ) service? ( jsonapi )
-SLOT=0
-SRC_URI=https://github.com/RetroShare/RetroShare/releases/download/v0.6.5/RetroShare-v0.6.5-source-with-submodules.tar.gz -> retroshare-0.6.5.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	104e1332efb829e2f7cbf89307a474f1	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=90b3b2f7d5fec1a673702a25e6fd224a
diff --git a/metadata/md5-cache/net-p2p/retroshare-0.6.6 b/metadata/md5-cache/net-p2p/retroshare-0.6.6
deleted file mode 100644
index dd1ca5e45128..000000000000
--- a/metadata/md5-cache/net-p2p/retroshare-0.6.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/cmake virtual/pkgconfig jsonapi? ( app-doc/doxygen )
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 sys-libs/zlib autologin? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) libupnp? ( net-libs/libupnp:= ) miniupnp? ( net-libs/miniupnpc:= ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 ) dev-qt/qtcore:5 gui? ( dev-qt/designer:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=P2P private sharing application
-EAPI=7
-HOMEPAGE=https://retroshare.cc
-INHERIT=desktop qmake-utils xdg
-IUSE=autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3
-RDEPEND=app-arch/bzip2 dev-libs/openssl:0= >=dev-libs/rapidjson-1.1.0 sys-libs/zlib autologin? ( app-crypt/libsecret ) gui? ( dev-qt/qtcore:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtxml:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver ) libupnp? ( net-libs/libupnp:= ) miniupnp? ( net-libs/miniupnpc:= ) service? ( dev-qt/qtcore:5 ) sqlcipher? ( dev-db/sqlcipher ) !sqlcipher? ( dev-db/sqlite:3 )
-REQUIRED_USE=|| ( gui service ) ?? ( libupnp miniupnp ) service? ( || ( cli jsonapi ) )
-SLOT=0
-SRC_URI=http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_0.6.6.orig.tar.gz -> retroshare-0.6.6.tar.gz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	104e1332efb829e2f7cbf89307a474f1	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=978ff4943a8df94490b956111e867e44
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index b6c9a87c6114..7b39e77288c3 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/cantera-2.6.0-r1 b/metadata/md5-cache/sci-libs/cantera-2.6.0-r1
deleted file mode 100644
index f471c978283e..000000000000
--- a/metadata/md5-cache/sci-libs/cantera-2.6.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 )
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_10? ( dev-python/ruamel-yaml[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) dev-cpp/yaml-cpp !lapack? ( sci-libs/sundials:0= ) lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/pip[python_targets_python3_10(-)] ) ) test? ( >=dev-cpp/gtest-1.11.0 python? ( python_single_target_python3_10? ( dev-python/h5py[python_targets_python3_10(-)] dev-python/pandas[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) ) fortran? ( virtual/fortran )
-DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
-EAPI=7
-HOMEPAGE=https://www.cantera.org
-INHERIT=fortran-2 python-single-r1 scons-utils toolchain-funcs
-IUSE=+cti fortran lapack +python test +python_single_target_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_10? ( dev-python/ruamel-yaml[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) dev-cpp/yaml-cpp !lapack? ( sci-libs/sundials:0= ) lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Cantera/cantera/archive/v2.6.0.tar.gz -> cantera-2.6.0.tar.gz
-_eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	scons-utils	03ca4edc3a0fdb533f0f358787059bdc	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f22f1c03cff75fd4b30644778de9c42d
diff --git a/metadata/md5-cache/sci-libs/libecpint-1.0.6 b/metadata/md5-cache/sci-libs/libecpint-1.0.6
deleted file mode 100644
index a36a7e84c64c..000000000000
--- a/metadata/md5-cache/sci-libs/libecpint-1.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pugixml test? ( dev-cpp/gtest )
-DESCRIPTION=Efficient evaluation of integrals over ab initio effective core potentials
-EAPI=7
-HOMEPAGE=https://github.com/robashaw/libecpint
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/pugixml
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/robashaw/libecpint/archive/v1.0.6.tar.gz -> libecpint-1.0.6.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=070eb3cac5c692e4ec15c27cea5684e9
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1
deleted file mode 100644
index 2f576952e169..000000000000
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-cpp/gtest-1.10.0 )
-DESCRIPTION=C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API
-EAPI=7
-HOMEPAGE=https://libspatialindex.org/ https://github.com/libspatialindex/libspatialindex
-INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=00d9e363256328d1ee4105b8cc468528
diff --git a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2 b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
index 1c30dc9ed949..940a2a347163 100644
--- a/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
+++ b/metadata/md5-cache/sci-libs/libspatialindex-1.9.3-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://libspatialindex.org/ https://github.com/libspatialindex/libspatialindex
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/libspatialindex/libspatialindex/releases/download/1.9.3/spatialindex-src-1.9.3.tar.bz2
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=0be149709afbd0184463a3e5235cfc20
+_md5_=197708c6f06c2ac26252719756419469
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.20.18 b/metadata/md5-cache/sci-libs/rtabmap-0.20.18
deleted file mode 100644
index 381e622e8172..000000000000
--- a/metadata/md5-cache/sci-libs/rtabmap-0.20.18
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= dev-cpp/yaml-cpp:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
-EAPI=7
-HOMEPAGE=http://introlab.github.io/rtabmap/
-INHERIT=cmake multilib
-IUSE=examples ieee1394 openni2 qt5
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk,qt5(-)?] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= dev-cpp/yaml-cpp:= ieee1394? ( media-libs/libdc1394:2= ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-SLOT=0
-SRC_URI=https://github.com/introlab/rtabmap/archive/0.20.18-rolling.tar.gz -> rtabmap-0.20.18.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=76335db60170c413d1722fade9792316
diff --git a/metadata/md5-cache/sci-libs/sundials-5.2.0 b/metadata/md5-cache/sci-libs/sundials-5.2.0
deleted file mode 100644
index f46bcbd0e824..000000000000
--- a/metadata/md5-cache/sci-libs/sundials-5.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-DESCRIPTION=Suite of nonlinear solvers
-EAPI=7
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-INHERIT=cmake fortran-2 toolchain-funcs flag-o-matic
-IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-REQUIRED_USE=hypre? ( mpi )
-SLOT=0/5
-SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-5.2.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=837f5a5e0890bb4cba1a202c52e1ba8e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 3f6e34cb8554..2851b4b0f220 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-23.02.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-23.02.0
deleted file mode 100644
index 2afd0dbbb615..000000000000
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-23.02.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit]
-DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
-EAPI=8
-HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake plocale wxwidgets xdg
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-23.02.0.tar.gz -> wxmaxima-23.02.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3b14959be4f2f73feba1cab127ff20b
diff --git a/metadata/md5-cache/sci-mathematics/wxmaxima-22.12.0 b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1-r1
index b175f392d56a..c15eb13c2a25 100644
--- a/metadata/md5-cache/sci-mathematics/wxmaxima-22.12.0
+++ b/metadata/md5-cache/sci-mathematics/wxmaxima-23.04.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit]
+DEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.2-gtk3[webkit]
 DESCRIPTION=Graphical frontend to Maxima, using the wxWidgets toolkit
 EAPI=8
 HOMEPAGE=https://wxmaxima-developers.github.io/wxmaxima/
@@ -9,9 +9,9 @@ INHERIT=cmake plocale wxwidgets xdg
 IUSE=test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.0-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
+RDEPEND=dev-libs/libxml2:2 x11-libs/wxGTK:3.2-gtk3[webkit] media-fonts/jsmath sci-visualization/gnuplot[wxwidgets] sci-mathematics/maxima
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-22.12.0.tar.gz -> wxmaxima-22.12.0.tar.gz
+SRC_URI=https://github.com/wxMaxima-developers/wxmaxima/archive/Version-23.04.1.tar.gz -> wxmaxima-23.04.1.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3b14959be4f2f73feba1cab127ff20b
+_md5_=8e8a6fa6023cee980ce2b4c3f0b27c53
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 12405f9b5ad7..ee5b1d3d760d 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r4 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r4
deleted file mode 100644
index a8b673b5a761..000000000000
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-texlive/texlive-latexextra ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=sys-libs/ncurses:= emacs? ( >=app-editors/emacs-23.1:* ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 )
-DESCRIPTION=Graphics Layout Engine
-EAPI=7
-HOMEPAGE=https://glx.sourceforge.net
-INHERIT=autotools elisp-common flag-o-matic
-IUSE=doc emacs jpeg png tiff vim-syntax X
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 emacs? ( GPL-2 )
-RDEPEND=sys-libs/ncurses:= emacs? ( >=app-editors/emacs-23.1:* ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	01bc6dc778b74a9deebe4e419a3b790e	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	104e1332efb829e2f7cbf89307a474f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=654da22a1a7802e0a5412b6c62ce6b80
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 5190eaedbcb7..ab4ba4461d03 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/sof-firmware-2.2.2 b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5
index b7e05b718eea..8303f6932478 100644
--- a/metadata/md5-cache/sys-firmware/sof-firmware-2.2.2
+++ b/metadata/md5-cache/sys-firmware/sof-firmware-2.2.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=install preinst
 DESCRIPTION=Sound Open Firmware (SOF) binary files
 EAPI=8
 HOMEPAGE=https://www.sofproject.org https://github.com/thesofproject/sof https://github.com/thesofproject/sof-bin
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=media-libs/alsa-lib
 SLOT=0
-SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.2.2/sof-bin-v2.2.2.tar.gz -> sof-firmware-2.2.2.tar.gz
-_md5_=eaea3b0089fdfebb0332c4fa722fa949
+SRC_URI=https://github.com/thesofproject/sof-bin/releases/download/v2.2.5/sof-bin-v2.2.5.tar.gz -> sof-firmware-2.2.5.tar.gz
+_md5_=e4980841ead10b93fb489455d1e89fd0
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4dbe5c2de4fa..274f6023c153 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20220509 b/metadata/md5-cache/sys-kernel/linux-firmware-20220509
deleted file mode 100644
index 4aec79f1ee48..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20220509
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
-DESCRIPTION=Linux firmware files
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-INHERIT=mount-boot savedconfig
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
-RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
-REQUIRED_USE=initramfs? ( redistributable )
-RESTRICT=binchecks strip test unknown-license? ( bindist )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20220509.tar.xz
-_eclasses_=mount-boot	3945d351ee3192381911f938f4ee527a	portability	964493f201f557a5c6baccacccf45ee2	savedconfig	8b5f9d995a970e49cd427c55d5840285
-_md5_=701de8aa0d70c32498ba8b9d4a4e5d0b
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index acdd0e50f12d..0fee48c17573 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/element-1.11.31 b/metadata/md5-cache/www-apps/element-1.11.31
new file mode 100644
index 000000000000..8ec5c48057af
--- /dev/null
+++ b/metadata/md5-cache/www-apps/element-1.11.31
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=A glossy Matrix collaboration client for the web
+EAPI=8
+HOMEPAGE=https://element.io/
+INHERIT=webapp
+IUSE=vhosts
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-admin/webapp-config
+SLOT=1.11.31
+SRC_URI=https://github.com/vector-im/element-web/releases/download/v1.11.31/element-v1.11.31.tar.gz
+_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=dc1badf34042c13ec1181919e72396a2
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.10 b/metadata/md5-cache/www-apps/nextcloud-25.0.6
index 74b03a70ae23..4203350e6a4e 100644
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.10
+++ b/metadata/md5-cache/www-apps/nextcloud-25.0.6
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=AGPL-3
 RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=24.0.10
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.10.tar.bz2
+SLOT=25.0.6
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-25.0.6.tar.bz2
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=b772ed2f135d04d9704fc6ae021cb982
diff --git a/metadata/md5-cache/www-apps/nextcloud-24.0.11 b/metadata/md5-cache/www-apps/nextcloud-26.0.1
index fe3c2cdd6d90..bc5b7eb77325 100644
--- a/metadata/md5-cache/www-apps/nextcloud-24.0.11
+++ b/metadata/md5-cache/www-apps/nextcloud-26.0.1
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=AGPL-3
 RDEPEND=<dev-lang/php-8.2[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=24.0.11
-SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-24.0.11.tar.bz2
+SLOT=26.0.1
+SRC_URI=https://download.nextcloud.com/server/releases/nextcloud-26.0.1.tar.bz2
 _eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
 _md5_=b772ed2f135d04d9704fc6ae021cb982
diff --git a/metadata/md5-cache/www-apps/owncloud-10.12.1 b/metadata/md5-cache/www-apps/owncloud-10.12.1
new file mode 100644
index 000000000000..86ce631f3ac7
--- /dev/null
+++ b/metadata/md5-cache/www-apps/owncloud-10.12.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=app-admin/webapp-config
+DESCRIPTION=Web-based storage application where all your data is under your own control
+EAPI=8
+HOMEPAGE=https://owncloud.org
+INHERIT=webapp
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip] virtual/httpd-php app-admin/webapp-config
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=10.12.1
+SRC_URI=https://download.owncloud.com/server/stable/owncloud-10.12.1.tar.bz2
+_eclasses_=webapp	1aad5c010cfdf11d0376c80467b0de4c
+_md5_=c85ecc4e092c67fdf38dc132e8f74dcf
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f809d957718f..6f528481d0d2 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/copyq-5.0.0 b/metadata/md5-cache/x11-misc/copyq-5.0.0
deleted file mode 100644
index 980b37445952..000000000000
--- a/metadata/md5-cache/x11-misc/copyq-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/wayland dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwayland:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/knotifications:5 x11-libs/libX11 x11-libs/libXtst test? ( dev-qt/qttest:5 )
-DESCRIPTION=Clipboard manager with advanced features
-EAPI=7
-HOMEPAGE=https://github.com/hluk/CopyQ
-INHERIT=cmake xdg-utils
-IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=dev-libs/wayland dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwayland:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/knotifications:5 x11-libs/libX11 x11-libs/libXtst
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/hluk/CopyQ/archive/v5.0.0.tar.gz -> copyq-5.0.0.tar.gz
-_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=08ad633dbd4b0ff8d59451da4d9a0a04
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 2d9453d35562..ec3dcbf27f49 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.1 b/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.1
new file mode 100644
index 000000000000..00a3ea6a1167
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/QGnomePlatform-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtquickcontrols2-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtdbus:5= >=dev-qt/qtquickcontrols2-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2
+DESCRIPTION=A Qt Platform Theme aimed to accommodate GNOME settings
+EAPI=8
+HOMEPAGE=https://github.com/FedoraQt/QGnomePlatform
+INHERIT=cmake
+IUSE=wayland
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtdbus:5= >=dev-qt/qtquickcontrols2-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5= wayland? ( dev-qt/qtwayland:5= ) gnome-base/gsettings-desktop-schemas sys-apps/xdg-desktop-portal x11-libs/gtk+:3 >=x11-themes/adwaita-qt-1.4.2
+SLOT=0
+SRC_URI=https://github.com/FedoraQt/QGnomePlatform/archive/0.9.1.tar.gz -> QGnomePlatform-0.9.1.tar.gz
+_eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	flag-o-matic	16483e58fadb0d47b4528f0aa7e171f6	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=55e3fabf81beadf845a77e3272c02db3
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 44adb8a91874..99bf5322d6f8 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/xpra-4.3.4 b/metadata/md5-cache/x11-wm/xpra-4.3.4-r1
index 09c9178c1ed6..ca9b9f195c6e 100644
--- a/metadata/md5-cache/x11-wm/xpra-4.3.4
+++ b/metadata/md5-cache/x11-wm/xpra-4.3.4-r1
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( >=dev-python/cython-0.16[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/cython-0.16[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( app-text/pandoc ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) test? ( python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) )
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) test? ( python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) )
 DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
 EAPI=8
 HOMEPAGE=https://xpra.org/
@@ -9,10 +9,10 @@ INHERIT=pypi xdg xdg-utils distutils-r1 tmpfiles udev
 IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 BSD
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) python_single_target_python3_11? ( cups? ( dev-python/pycups[python_targets_python3_11(-)] ) lz4? ( dev-python/lz4[python_targets_python3_11(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_11(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_11(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] media-libs/opencv[python_targets_python3_11(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) python_single_target_python3_11? ( cups? ( dev-python/pycups[python_targets_python3_11(-)] ) lz4? ( dev-python/lz4[python_targets_python3_11(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_11(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_11(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] media-libs/opencv[python_targets_python3_11(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/x/xpra/xpra-4.3.4.tar.gz https://dev.gentoo.org/~chewi/distfiles/xpra-4.3.1-tests.patch
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2ffa465f65b5732c30e93ebed0f1443b
+_md5_=12010757bccb038562e0939ac190ca18
diff --git a/metadata/md5-cache/x11-wm/xpra-9999 b/metadata/md5-cache/x11-wm/xpra-9999
index 0476a77927a1..8e7e0de926af 100644
--- a/metadata/md5-cache/x11-wm/xpra-9999
+++ b/metadata/md5-cache/x11-wm/xpra-9999
@@ -1,6 +1,6 @@
 BDEPEND=python_single_target_python3_10? ( >=dev-python/cython-0.16[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/cython-0.16[python_targets_python3_11(-)] ) virtual/pkgconfig doc? ( app-text/pandoc ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) test? ( python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) )
+DEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) test? ( python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) )
 DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy
 EAPI=8
 HOMEPAGE=https://xpra.org/
@@ -9,9 +9,9 @@ INHERIT=git-r3 xdg xdg-utils distutils-r1 tmpfiles udev
 IUSE=brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama python_single_target_python3_10 python_single_target_python3_11
 LICENSE=GPL-2 BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) python_single_target_python3_11? ( cups? ( dev-python/pycups[python_targets_python3_11(-)] ) lz4? ( dev-python/lz4[python_targets_python3_11(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_11(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_11(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] media-libs/opencv[python_targets_python3_11(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
+RDEPEND=python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_10(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-),cairo] opengl? ( dev-python/pyopengl[python_targets_python3_11(-)] ) sound? ( dev-python/gst-python:1.0[python_targets_python3_11(-)] ) ) x11-libs/gtk+:3[introspection] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXres x11-libs/libXtst x11-libs/libxkbfile brotli? ( app-arch/brotli ) csc? ( >=media-video/ffmpeg-1.2.2:0= ) ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) jpeg? ( media-libs/libjpeg-turbo ) pulseaudio? ( media-sound/pulseaudio media-plugins/gst-plugins-pulse:1.0 ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) vpx? ( media-libs/libvpx media-video/ffmpeg ) webp? ( media-libs/libwebp ) python_single_target_python3_10? ( dev-python/netifaces[python_targets_python3_10(-)] dev-python/pillow[jpeg?,python_targets_python3_10(-)] dev-python/rencode[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/netifaces[python_targets_python3_11(-)] dev-python/pillow[jpeg?,python_targets_python3_11(-)] dev-python/rencode[python_targets_python3_11(-)] dbus? ( dev-python/dbus-python[python_targets_python3_11(-)] ) xdg? ( dev-python/pyxdg[python_targets_python3_11(-)] ) ) html? ( www-apps/xpra-html5 ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) xinerama? ( x11-libs/libfakeXinerama ) python_single_target_python3_10? ( cups? ( dev-python/pycups[python_targets_python3_10(-)] ) lz4? ( dev-python/lz4[python_targets_python3_10(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_10(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_10(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_10(-)] dev-python/pyinotify[python_targets_python3_10(-)] media-libs/opencv[python_targets_python3_10(-),python] ) ) python_single_target_python3_11? ( cups? ( dev-python/pycups[python_targets_python3_11(-)] ) lz4? ( dev-python/lz4[python_targets_python3_11(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python3_11(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python3_11(-)] ) ) webcam? ( dev-python/numpy[python_targets_python3_11(-)] dev-python/pyinotify[python_targets_python3_11(-)] media-libs/opencv[python_targets_python3_11(-),python] ) ) acct-group/xpra virtual/ssh x11-apps/xauth x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) udev? ( virtual/udev ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 ) virtual/tmpfiles
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 ) || ( client server ) cups? ( dbus ) opengl? ( client ) test? ( client clipboard dbus html server sound xdg xinerama ) ^^ ( python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	87ebb7e1e8d4ac49be0a91406b443060	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	104e1332efb829e2f7cbf89307a474f1	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	4544ab96b58e177dc52d75e42f5ee307	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=39758525632fab2d99680330db005ea1
+_md5_=31ab7b5efe36e5806fe7b3d67abb9483
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 5798be0a83eb..017f795778cc 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-screenshooter-1.10.4 b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.4
new file mode 100644
index 000000000000..4c9dba8d1289
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.10.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/glib-utils dev-util/intltool sys-apps/help2man virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
+DESCRIPTION=Xfce4 screenshooter application and panel plugin
+EAPI=8
+HOMEPAGE=https://docs.xfce.org/apps/xfce4-screenshooter/start https://gitlab.xfce.org/apps/xfce4-screenshooter/
+INHERIT=xdg-utils
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.66.0 >=x11-libs/gdk-pixbuf-2.16 >=x11-libs/gtk+-3.24.0:3 >=x11-libs/pango-1.44.0 dev-libs/libxml2 >=net-libs/libsoup-3.0.0:3.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.8 >=xfce-base/exo-0.11:= >=xfce-base/xfce4-panel-4.16.0:= >=xfce-base/libxfce4util-4.16.0:= >=xfce-base/libxfce4ui-4.16.0:= >=xfce-base/xfconf-4.16.0:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfce4-screenshooter/1.10/xfce4-screenshooter-1.10.4.tar.bz2
+_eclasses_=xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=7e4cf2663b56c88e1c81f8849942f094
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e0f954cba2db..8d6e610cf654 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15668 BLAKE2B 449292f439e2a4f4fd7b4726028a046b309262c1c104b330b62b26428794c6a1ff66902103e9c2359f352f474b113cc9c85ddbbb187a374b6211d02e6ca79ff3 SHA512 e7b892ad549ad1d2a69c8cd56f9a18807e1e7a0c3b686e86ad5dca719913cab1270dea7dd5e376d522493285e5a8117f923772e2df0f2019b0c49a02107d6b03
-TIMESTAMP 2023-05-14T08:40:02Z
+TIMESTAMP 2023-05-14T14:40:00Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRgnmJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmRg8sBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZgg/9FU/tqzXzj1BPng6ATSIHI4X7kqMZ58bvDMkWBAIoSf9K1SY++rw3Qb3d
-BpSTfV0GzZHAPqaswhMb36+6SoF+KkAx+WQKX1MkGp82MOeN9R8/pPb9QMQ2FsHM
-agQqwbAB4v/v4GmCVo0QN6t6HeuK3Y9f03ZqsMFitN4Ae6xegFQRYsgUDPmcTQ1l
-bC+QkCJ4zOPh4xRsapKkaYpYzO0aCcI/q8n+++XV9RYWfRifwpbzkYPx/G6xoMP9
-/mit/aWpvhOdsvnLm10FUD8DBP0KqwAp5Kt4SJwv2Oo61Hvc6Q3064qmYt3Igb20
-nKrxeBrJZIk2jpoEX0pzYbAUDXn5E2OX+qzBfmSQgaovyMX9AHYjDYHhSACnalJR
-2fNajmgrezLWtZG60BgJ00M+YczAgdYOMpA+VdO2xek+BPUyZWzLFgmnW8WmVsW7
-ITH0xAIMxtIbq0r4UNYY5b3vDtkMOeBb8N/eb3LI1nu8HZoy8q816pm+d89RV9N+
-eAfFKbGDSeS/0VBP9ifVhvQn2y6Ho/xvoq1qRJanxldC6bshnmXmX2TIo9giKmM2
-V+2x4GqyF/Go7RvY19KnyA8bZwcH5TeIPErtZ7oABSKBnFz0gEGfn9OiqYQeOhrU
-7QzxwHeQamIG9oraxTPhGVTtXm1USHtHUDvHfWcbMo3JfC8L4zg=
-=sXMt
+klDToBAAkB3QLc18xxgSCfMqLoHKD6qeF0JJXI8P+PqqRux5OyQKLE6qwHV5PEVH
+ZkJ3VLW2nKgp19kp6aMBSJJWixO0Qlfobiyt6i6WP+0ELhNNvHlPAW6gyK1Vqd8q
+GOeY0h5I0nbsjs//D9LY3tx67XZYbHBJFdlMSX+3w6ibqYySNCVTIQfkRqIJ6vTf
+N5LzOoALNhfAObirJxsDpvnGJDGFMLHGKrGzN+XlXU8cBWWkYlK+qcf2f+bmYQRp
+DpruR+woQ712hiuX5wEqhlWZZB4SCh6F9r7hncVi4ZTyet1oVhRA410GnnrvG2R9
+hCAAHCZ9kk6t5Pe+xL3TAvaZKlhS/P+nIM587eeIpnQVFw1xmTXSrakX+1bM7Lfs
+NxWWmKnNiIujfJ7MdbH1ZPtjrcABBZ1N5fqO2QL3d+bLIegbInTIQIX4PKAtI3ix
+1IN9HGp6t6oMjiSK2H10hDr+QVNxwvqNzTZvnv96DG7khVw0bmczuGGGPmC5CUFD
+OC5RH0EwNNLxdg9cx8ejcnXILZHuhCjL8TApoT5ArqQCisd4/aWR9AIabzIG1Hk8
+sg7t280kdY4cZKOEfH2A9801WENCGQrqtQJxLHKyqzY45Snh26cIfys0uvlJ05LE
+0AQpV08EZcaGIsRVwUI7OAeYQlDcVHqaF5nAZAEWB82ilGw/94s=
+=wkpH
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d0cb68536ef4..f927625aae3b 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 08:39:59 +0000
+Sun, 14 May 2023 14:39:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 4d7bdce4cbff..c576f68d1a45 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun May 14 08:39:59 AM UTC 2023
+Sun May 14 02:39:56 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0c4074f1e121..fd06e9fcef59 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 08:45:01 +0000
+Sun, 14 May 2023 14:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 3b796ae5adc8..6be5e626e83a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bf43d47621b7e4c869a2a0c75697d5541b90f5e9 1684052956 2023-05-14T08:29:16+00:00
+b86bdf2c2d16d11c6a6ba3465aec11cb656d6386 1684074381 2023-05-14T14:26:21+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7af6f5a7f679..2efcecac6709 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1684053601 Sun 14 May 2023 08:40:01 AM UTC
+1684075201 Sun 14 May 2023 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d0cb68536ef4..f927625aae3b 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 14 May 2023 08:39:59 +0000
+Sun, 14 May 2023 14:39:57 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 3eda1f4ab355..9ab263611b22 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 8b27ace3bc8b..b564b445fea7 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -4,6 +4,6 @@ AUX cvmfs-2.7.2-find-package.patch 1412 BLAKE2B c66a614a1aa7451ecac2cceb892c370d
 AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa535ee469ce6b3967bc9cff4743eac9e923c6a4cde74cbd7e988aff70022fc151f7745230d7517d09060e8d62f2bfef91 SHA512 1518dee2b016b5c7bf8c99e0f86a5da87d5dcd37a3d25f6dfb5afc0906ea41e67747dd37360a7e6da8557f8e4aa8587c317a4f105c4954b227aeb28190524ef9
 DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
 DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
-EBUILD cvmfs-2.10.1-r1.ebuild 2263 BLAKE2B 2a9c8646c273e1e5dfa509f1951845049438c033be70979d73a2a0a5d715b019cf047526ae77e615644587a8159518705c7f048c49e41813a2cddc0d5cd9c68f SHA512 b70b484ba6eaef650f4e893b845343be9358dba24472f36387f38960fe0fbc342b07822e81b0fa384c3d2af3d18b5daf4e963b450cc45bedd5c0204896de64a3
+EBUILD cvmfs-2.10.1-r1.ebuild 2261 BLAKE2B 09bbaf4ce04acfad64af5077cbb9f5bb849a9884e8bcdc90051ab25e8f46a8e859e86c2748a74c2360db93bb76d987d06b4472ddba740d53cd7c47e4d434950e SHA512 04b231737bd6a867d2765821052c2d5010a3490259775d87a1e99ac85d60807b6d10a7cfe07bee77e9a932e6af737d0e4a2127b96349f1410f6deeb546e98e7c
 EBUILD cvmfs-2.9.4-r1.ebuild 2357 BLAKE2B 5fd703167dd471b6272be4ffed10f59a178d0cd56243a327217599b5278ad48ff9c36c36c31237b47830832a953f79de6bb0ec0a3f3ceaec3ef49df78022ae0f SHA512 a2c4345091b801f861b5d864cd4975953f0e9d65fb1abfb2074f09fe71042ffcbf7e5b58d2b7ae82b80bea2115f05ec28b58df026eba92728a3cd3e6d8c5625e
 MISC metadata.xml 1332 BLAKE2B ad7f06c80b66cf55f6734da058bd21efc10fc8c02165da01c1b5a96f81f4ba0c0f874768482ed271560ae711e862c2b4fea5a92aa09763d45a9a103574409cad SHA512 9fab3df5e006e4b34cbf22b4f9b6f5235d4c1937f8b1e69a41637988c48f2ba583f988c9fff07ccfc7b285ddc9058ca08f660d22211b97cf06a580b3794b27a7
diff --git a/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild b/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild
index 37a64e0069e1..fe29fb39c811 100644
--- a/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.10.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="server"
 
 CDEPEND="
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 3a4811ea55d9..fa8937bcc9a0 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 813bf5b62211..51940f48b230 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -9,9 +9,11 @@ DIST FileZilla_3.62.2_src.tar.bz2 4944158 BLAKE2B 84febe912d1e5337c085c3ae515969
 DIST FileZilla_3.63.0_src.tar.bz2 4949450 BLAKE2B 6fd21ece9615c6c16c63edecf769034a9c2b3a7183dfb7b6b9ae2effe710695ee1a078ca88c549f489d9d156fa884d9694c2a2ba3728527db482e3a813aeec87 SHA512 47065cfbc1944cd9f8b2c4d3b2a2bb1e9e169b083a46d79fe477cc3a628e91241822c739f308ce614212710f431c333f33193b9261f9b5ec677eb8c62a634364
 DIST FileZilla_3.63.1_src.tar.bz2 4950427 BLAKE2B 8d3fb5be0030b0cbfacfe80c2c2564fa9974860f4ce7d9f5d222208bb751b05c0f3f5c527a9b48b538586d12c499ce49e0e59328bed71bcd3600a15b8742d0a6 SHA512 c4f70eb772c868508dc10e1d3a5c9300bc034523f1ee374b30178048ded8e70be3d6307769509d4f8c0921126726dafbcbfda0066fe6d2c5f93af369196618c0
 DIST FileZilla_3.63.2.1_src.tar.bz2 4966152 BLAKE2B 04f2f6265f12053e25cd01135af62c144e5970ec28dd408b7c8484b20b3f6fb816a6baaf4cc4141ad31d5ae24d8a97e6360acc921d80d82ddf22e0eca6f7a4c5 SHA512 179dfd0e5e1bb1a8c49d035ac5f0f4cb54d09dd344b3d677a7a45224f50bae3bbc27a2fb404e90d69ea97abea1c69a6392d64831e5a7f33f89f70c3fd72d4006
+DIST FileZilla_3.64.0_src.tar.xz 4041200 BLAKE2B 38e9cec621573ff541183256943d055731f2acad95ab60f771e27b5eed6f0e447c8bf4cdf38c2322a340cd5c4a55ffb5a6b75b0de1bfdc0f8003b8aaaed900a1 SHA512 4c4ab1969613e789999bf634d62b612f21be5e221b969941c8097b7cb3525b089f4dd846e6489a3e66df7671732445e7fb8f77fc8d59cb34a78044136a3d2a99
 EBUILD filezilla-3.61.0.ebuild 1614 BLAKE2B 4e097b16b81010c04974b7a1c14d174895aa38af453bd3d882a11a0173c49ad7f6d7b21f87e2c3248e1ad0fe75cb0353083800d664bb9bb7e493f951681d03b3 SHA512 3642fc3e02ea4297ee53d4aa0933d677eb8a2d8ff8a60706c68cdb5065cf353999f71913ffe49b4907f4e60c15d3301e0b20a4085b39364357ee4ea4cdddf639
 EBUILD filezilla-3.62.2.ebuild 1618 BLAKE2B 53ce72501d94a40593d743cad2fd5e51c185d2b3fd02714130dd097c987824dccd203e8979e3aeb8187482f8b51cd7acfd758dbef27b7709ced7af060cf19244 SHA512 99b4a0387e6b7da09626f437848ee5543d14810d8450b3c8e8f0b8c61d028a80f8e01597a1080bead695ffd2b2d51fe16d7440c69a1034e309b6138697911e11
 EBUILD filezilla-3.63.0.ebuild 1570 BLAKE2B d279cde2335e41d5fa8ad56e5caee2a2fe5366cf19e58b6943797e1894e58ab25d0326f3159a7741a19b1c81193c0e5e9907d07ff6fb0e2ec34235ebe716e1e1 SHA512 b4b36dcc94d46d0d969cf9daec483d92f62a277e7d30d16fe2184a353965095b7330b6cfa63025022dc70cf88869b13771efff921fdee9e01308486c0f3eabed
 EBUILD filezilla-3.63.1.ebuild 1614 BLAKE2B 2061b33c07d4e12c3831c0a585c3f8f810d75afb47973c505aa89f9310f8dd9fb39e955f7cbc94166843729cb636ace0aabbe43e70d9821d0ca441912ccee266 SHA512 a9d2fc053043689254b10815b867480303031cd42b0baef704972100615f8353a85251cf2dcadb4d2e70a12641740369fc96424b56d3aa1d1ecfa1933b2c511b
 EBUILD filezilla-3.63.2.1.ebuild 1570 BLAKE2B fe69cee9ddabb8ff764db1d56e253bde87a2b2b282b443942a9d72e996361485ffb7b692674040e196452a6fc93d54213f2afc212516305212324daa4e906214 SHA512 ea2f3058986d78bdad317c1b5aa811ce212808c3a39d79025eeeddbfcb0408417faae8fd4dc6e2e462d4c421b23720408f58510620ee09f89297a3d01da23c95
+EBUILD filezilla-3.64.0.ebuild 1569 BLAKE2B e54381be39db4b72a514f1180c1441ed0d0560c3fc12b264e3603340b3190700c092fae5e103843b06b4d104c985e8414f0266addb4fb61c9f9fe4777a7c017c SHA512 1daf16b6323b84c90b9fab8d1a1ca0987643a9f1ce3ff0e409416f2284f193ac0df8bd39f42cd4050ae978902b0db78bc273c134bc2addc54a5a8e3611bd292a
 MISC metadata.xml 449 BLAKE2B 3a9fbf5c444404c3922fac61b0a36429acda9bd582d3b2049e9637088acf1a33af6c9a68052325969037951640ec3b9c8e2d357cbbd06a4655a504cb363e0c58 SHA512 f33dccada194313d97e91f514ca89685a2c643a0fb736e3a90065b246aced161fc45198aa05fea8fb96ff7827ddb8722344158e7d4c4b68c1bd008097fa99b7c
diff --git a/net-ftp/filezilla/filezilla-3.64.0.ebuild b/net-ftp/filezilla/filezilla-3.64.0.ebuild
new file mode 100644
index 000000000000..eaf2ea896cdb
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.64.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools wxwidgets xdg
+
+MY_PV="${PV/_/-}"
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="dbus nls test"
+RESTRICT="!test? ( test )"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND="
+	>=dev-libs/nettle-3.1:=
+	>=dev-db/sqlite-3.7
+	>=dev-libs/libfilezilla-0.42.2:=
+	>=dev-libs/pugixml-1.7
+	>=net-libs/gnutls-3.5.7
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	x11-misc/xdg-utils
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.22.1-debug.patch
+	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets
+
+	local myeconfargs=(
+		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4f28aca528a9..1bfcf95bca72 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 61a945eac271..b58800693cdf 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -6,5 +6,5 @@ EBUILD grpc-1.43.0-r1.ebuild 2815 BLAKE2B 922f3cbaae5b654c27508698a134c7fee93802
 EBUILD grpc-1.43.0.ebuild 2684 BLAKE2B 0ae8a6757682d3ef8861f6ca1f27462a4341b537a75b55b443746339102bc7ac76360b924e2f76a7032b28f0469bab8c1d0d3709f04376b43775698f5614da5b SHA512 e6cc2f3dda42631beb3356b3699a0ea337268fd9f80e2d51bba6a89b165e64835edbae14d6bb62094460f9a8a3c48489a72a070f8b37baa7223f3146e954431c
 EBUILD grpc-1.51.1-r1.ebuild 2811 BLAKE2B ebe59fe4812a4b754cd3336fd1664129ea14ea99c56d52b03e202a29aed57e5ca24e8627dd5eb60c70e0ec15ee35f307d0f754cb60b362cd9df9b60a4b8d3b84 SHA512 2f72e5880faa1a0e060beb49a815ec60fac087f4217feb006f48a5d717c02ed6c50c4e54f7a74c536d6e13fce2b638edf75cefffee4027a0a757291765ba205c
 EBUILD grpc-1.52.0.ebuild 2805 BLAKE2B f359cc96ce0ab81fbb190d9012b1a669805dca14ec3a39b9ace0b595db393ed41f766d1c81e32bf7fda59c89b006044248ed717e6c3302c8f03f2ea7dee9258f SHA512 1d2f3f555213647b0cf003260251f63cf07532af1a5bac5baa303ac0cdef3778e430bcc215e0446e18c38d03c0ba0f915f60320f504a36bac1a64e3d1910198b
-EBUILD grpc-1.52.1.ebuild 2805 BLAKE2B f359cc96ce0ab81fbb190d9012b1a669805dca14ec3a39b9ace0b595db393ed41f766d1c81e32bf7fda59c89b006044248ed717e6c3302c8f03f2ea7dee9258f SHA512 1d2f3f555213647b0cf003260251f63cf07532af1a5bac5baa303ac0cdef3778e430bcc215e0446e18c38d03c0ba0f915f60320f504a36bac1a64e3d1910198b
+EBUILD grpc-1.52.1.ebuild 2802 BLAKE2B 84b77308d84900395ad9d0f00a302121c31587a6e2554eaa29d45894dc7503fb516f86bad4a2b422d70ab0dd370c93433d88361e2008fd5595a2319f94d36d03 SHA512 bb9c743d0dfd977e95ee23da364e1f45aec23584be6579f8aa2f463d97b9bc6005b4094267ab53596024f904a2e36d1f7183cbb03f2ca49dcb7240860768f99e
 MISC metadata.xml 564 BLAKE2B b28a7f5775062d33662cb139c3aec628dff54f720e6a47fb205cccb4527d21ad17460638038ac3c4534e76f1f2033078fbe8195f103428375129ec85ca21eda5 SHA512 50b7b91a7f97eb7507c523580bbe4bcbce421987826ac22d8e2fac47de69f30731cb9d5a3a1931e9caccba94066ef874e47934c053965e233f8e302a7d7e6d1e
diff --git a/net-libs/grpc/grpc-1.52.1.ebuild b/net-libs/grpc/grpc-1.52.1.ebuild
index 1bc65a8edf87..c36f6dbeb491 100644
--- a/net-libs/grpc/grpc-1.52.1.ebuild
+++ b/net-libs/grpc/grpc-1.52.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/30.152"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc examples test"
 
 # look for submodule versions in third_party dir
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 5d39e6408468..661b3ee7659a 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/ytnef/Manifest b/net-mail/ytnef/Manifest
index 99baa7f51ef9..4465d767de0b 100644
--- a/net-mail/ytnef/Manifest
+++ b/net-mail/ytnef/Manifest
@@ -1,3 +1,5 @@
 DIST ytnef-2.0.tar.gz 301906 BLAKE2B 3d42cf3bfc311a8d227424939cdb1e7b37a038314655b24ce54e26fbc0e5a0a7aa9fad0d4592297a5c521d3957c753b492e9724edb06c449d654faf68c7f43e7 SHA512 9ceba15a774f552911779859b7de11baddb7f980b0e8751c02a0c27275fa5624a4d4d24177bb4edba243acf3a9c5b89ddbbed1e759a330794bed8b2da63ffeb6
+DIST ytnef-2.1.1.tar.gz 301963 BLAKE2B 257fa97a80b4f0d00f9d24605f484dc68fafe06527f448eac6f95e88e270bd37a51603fad2b3705b2ccba99f73e3b5619d502191ba646a2b79d45e661018d3fc SHA512 2bc8c42117266090e236063ce31d0db49acca7c24c74dcaaee0338b5b5b4284297e4255c7d8ed0795075a145c6fc7ca036fd7a96fb7bab324c686ef327b8017d
 EBUILD ytnef-2.0.ebuild 694 BLAKE2B d5a07628bd37db35ed5b4214ba54b9019b894ddaf3eb28fe08bcbe3ff0390d8b38f58abc05c5a4b19f9a13164da0d36a21fbdcc1eb8966da6679e339e66406d2 SHA512 0c458e489cbfed5f23a3a6f99cf8345e874c0c3eb06a8248efc7c69b14eefc525e8e6a63a99b002fc683a2fbb91c70e448aa02f97782a490e0d1271a55bc88e2
+EBUILD ytnef-2.1.1.ebuild 700 BLAKE2B 48190dead6c94f141d2b5e3365bdf4e30cf5367535740718085af20ab1bca90e8c335bc9b656f8ec50650cab9ffa3a8507bc6fc36b4721af49f87c5aa4083071 SHA512 31ef99c8f04f25e5527437a6e5ce97b1c18b093b3bfa708fb91ca307888eb939e00d20b739e7e45f99b899f96ff47a4a322df11fc0264622b08ed08345e1b526
 MISC metadata.xml 340 BLAKE2B d4e3cce4e821eecb26dee071adc1ef002bf649c179975c1b261fc1fc5412e2944365e3e47ea61c9fe064ef9a25b0a553558f397f26d2b9e154ed2d2cabccc872 SHA512 c836ebc7317a5e7dcbce8947f0dbfca2364a911ac374f81f1be8e7d745be59bce72367062f851561dade6fc438fe6c1dda7d6d6782b77e873cc0dbbc5def2b54
diff --git a/net-mail/ytnef/ytnef-2.1.1.ebuild b/net-mail/ytnef/ytnef-2.1.1.ebuild
new file mode 100644
index 000000000000..500dfe8510ff
--- /dev/null
+++ b/net-mail/ytnef/ytnef-2.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Yeraze's TNEF Stream Reader - for winmail.dat files"
+HOMEPAGE="https://github.com/Yeraze/ytnef"
+SRC_URI="https://github.com/Yeraze/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+SLOT="0"
+QA_PKGCONFIG_VERSION="${PV}.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="dev-perl/MIME-tools"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 1137eac671b9..55af49be6779 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index c0e527b7a686..0e2981d80998 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,9 +1,4 @@
-AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37
 AUX retroshare-0.6.6-fix-cxx17-compilation.patch 1753 BLAKE2B aeba3e200eaf78867220227b766d2e396322d93e14afa885ba8ac5d8d5c88b9806a1fc90a00b2e7a364cdfcfa04776da9974293a394fc4d946ca30716daf931c SHA512 09f146aaaa9570eb4b01a9b325acbf6648d88ddde222128f709ecc89038ce5d8c9fba046abdf36547b4ee7e653bf058a3a51f775a78e71b760e0e513d43005e6
-DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
 DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
-EBUILD retroshare-0.6.5-r2.ebuild 4114 BLAKE2B dbc08ddaf55fe725e61f03f85458d334b73e5d641a050d418b63b1b5368d6447b4cd3a6ca45f75a7d8cdffd089814adc62e24243507d72a9438ff2afff1f9784 SHA512 4dfb1b8cb8e941a593e806136823602974b1f9fd8a3fdfd4541ed4253404d9a679fb7f75bba5072e0f8302d75d57de5d3240d98145eaae59b026c04eec4b8e39
-EBUILD retroshare-0.6.5-r3.ebuild 3734 BLAKE2B f085af9005a35f126d45ad579cff0b907301ee6d3ed1280e4668c51a0db170e681cd2cc246d0306842c01e19dc1548407f38a4139c48498a28262bbabbb365df SHA512 cc3d8766f874e35365995ed5758d2711db05590ee76cf65f6ce2807ad4de611e45adec9c9fa486e60d55974fb3691c66f24b4889abcf0b059256968f5a3b39ad
 EBUILD retroshare-0.6.6-r1.ebuild 3523 BLAKE2B 0ecb30cbc477fab14d582c3d372e0a9bbffcfcd24d2d7bc36f8cfcbcdac77887819856da556ccdda4aa3eeebfc601dfded94eb381f37fe33b049e717e6129cb9 SHA512 8c44bbb8b53fa10f796efc6abdc520e7edde2a70125d6f46b900b77e52061f2a3af4d8a08cb9f38719f24796f75ff5260de1a7a9e372d2888f9331a07792670b
-EBUILD retroshare-0.6.6.ebuild 3481 BLAKE2B 4888c2ac8c7733dba086f0616d3a6e6421daeeadf2ed30c16043dc88a06fbb66e2812740c0ff3ddaa2f376858d2cef81580b6ea14245d4cafeb83d5a61ebd42e SHA512 50d1083dbd9fcd0e2333193473903b828e7b04341da6655bcefc8b249ab591f016731de2ef0ac61aa5e95b13532017d62505df2931ba31453a43657f8e9d05ad
-MISC metadata.xml 1936 BLAKE2B 09abd24c20a06e479e8212558b70a8c08b737df830d68242f07e88fb1f070de620eeb8bf0a047317f9661b8af9d213720041f25dd06f8f01ac6454eca3f4bb9b SHA512 f4365576e75eb0de36b4c1bff1e73fd87f8cbb1d0d6ecf6ae64081d9cca3c534c7ba577b1209aac287699f25d852cca8e316a4ed0f91b852527f27f9b0b80b57
+MISC metadata.xml 1571 BLAKE2B 15ce97e32933f85fb2793ed58786251cb78bb8f2a5107a043ccd3daf1c6251fe07fa2223020375cbc6779a3e425808de594868c167ff4475dbb46342e2f3e783 SHA512 62f7213684786ddbac51fe90a5d3269cf493df6df89c801bbfe0ab856d001ff5b37fecf62818c07483c9fe4eb6eb0ded180c2e661efde7aceee93980a7dc8cbe
diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
deleted file mode 100644
index 21147a6391b0..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001
-From: Phenom <retrosharephenom@gmail.com>
-Date: Mon, 1 Jun 2020 13:44:43 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- retroshare-gui/src/gui/elastic/elnode.h        |  8 +++++---
- .../src/gui/gxs/GxsCommentTreeWidget.cpp       | 16 +++++++++-------
- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp    | 18 ++++++++++--------
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h
-index 1e0edd1a87..33043ddab3 100644
---- a/retroshare-gui/src/gui/elastic/elnode.h
-+++ b/retroshare-gui/src/gui/elastic/elnode.h
-@@ -26,6 +26,10 @@
- #ifndef ELNODE_H
- #define ELNODE_H
- 
-+#include "graphwidget.h"
-+
-+#include <retroshare/rstypes.h>
-+
- #include <QApplication>
- #if QT_VERSION >= 0x040600
- #include <QGraphicsObject>
-@@ -36,9 +40,7 @@
- #include <QGraphicsItem>
- #endif
- #include <QList>
--
--#include <retroshare/rstypes.h>
--#include "graphwidget.h"
-+#include <QPainterPath>
- 
- class Edge;
- QT_BEGIN_NAMESPACE
---- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp
-@@ -18,6 +18,12 @@
-  *                                                                             *
-  *******************************************************************************/
- 
-+#include "GxsCommentTreeWidget.h"
-+
-+#include "gui/common/RSElidedItemDelegate.h"
-+#include "gui/gxs/GxsCreateCommentDialog.h"
-+#include "gui/gxs/GxsIdTreeWidgetItem.h"
-+
- #include <QAbstractTextDocumentLayout>
- #include <QApplication>
- #include <QClipboard>
-@@ -25,13 +31,9 @@
- #include <QMenu>
- #include <QMimeData>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTextDocument>
- 
--#include "gui/common/RSElidedItemDelegate.h"
--#include "gui/gxs/GxsCommentTreeWidget.h"
--#include "gui/gxs/GxsCreateCommentDialog.h"
--#include "gui/gxs/GxsIdTreeWidgetItem.h"
--
- #include <iostream>
- 
- #define PCITEM_COLUMN_COMMENT		0
-diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
---- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
-@@ -18,19 +18,21 @@
-  *                                                                             *
-  *******************************************************************************/
- 
--#include <QApplication>
--#include <QThread>
--#include <QTimerEvent>
--#include <QMutexLocker>
-+#include "GxsIdDetails.h"
- 
--#include <math.h>
--#include "GxsIdDetails.h"
- #include "retroshare-gui/RsAutoUpdatePage.h"
- 
- #include <retroshare/rspeers.h>
- 
--#include <iostream>
-+#include <QApplication>
-+#include <QMutexLocker>
- #include <QPainter>
-+#include <QPainterPath>
-+#include <QThread>
-+#include <QTimerEvent>
-+
-+#include <iostream>
-+#include <cmath>
- 
- /* Images for tag icons */
- #define IMAGE_LOADING     ":/images/folder-draft.png"
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 56985f7e44a7..7f0b4e9f7e6d 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -20,15 +20,11 @@
 	<use>
 		<flag name="autologin">Enables potentially insecure autologin capability via <pkg>app-crypt/libsecret</pkg></flag>
 		<flag name="cli">Enables terminal login support for retroshare-service</flag>
-		<flag name="control-socket">Enables API via Unix socket support</flag>
-		<flag name="gnome-keyring">Enables potentially insecure autologin capability via <pkg>gnome-base/gnome-keyring</pkg></flag>
 		<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
 		<flag name="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag>
 		<flag name="miniupnp">Enables UPnP port forwarding via <pkg>net-libs/miniupnpc</pkg></flag>
 		<flag name="service">Enables the new RetroShare service</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
-		<flag name="webui">Enables Web interface and API support</flag>
-		<flag name="xapian">Enables GXS content indexing and search via <pkg>dev-libs/xapian</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
deleted file mode 100644
index e4579943fbac..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
-
-REQUIRED_USE="
-	|| ( cli gui service )
-	service? ( jsonapi )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	control-socket? ( dev-qt/qtnetwork:5 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )
-	webui? ( net-libs/libmicrohttpd )
-	xapian? ( dev-libs/xapian )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? (
-		|| (
-			>=app-doc/doxygen-1.8.17
-			<app-doc/doxygen-1.8.16
-		)
-	)"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
-	# CRLF endings break patch...
-	edos2unix retroshare-gui/src/gui/elastic/elnode.h
-	default
-}
-
-src_configure() {
-	local qConfigs=()
-
-	qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
-	qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
-	qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
-	qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
-	qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
-	qConfigs+=( $(usex service '' 'no_')retroshare_service )
-	qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
-	qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
-	qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
-
-	eqmake5 CONFIG+="${qConfigs[*]}" \
-		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
-		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
-		RS_UPNP_LIB=miniupnpc
-}
-
-src_compile() {
-	use jsonapi && {
-		nonfatal emake ||
-			elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
-	}
-
-	emake
-}
-
-src_install() {
-	use cli && dobin retroshare-nogui/src/retroshare-nogui
-	use gui && dobin retroshare-gui/src/retroshare
-	use service && dobin retroshare-service/src/retroshare-service
-
-	insinto /usr/share/retroshare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	use webui && doins -r libresapi/src/webui
-
-	dodoc README.md
-	make_desktop_entry retroshare
-
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_pretend() {
-	if ! use sqlcipher; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 0.5.9999; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
deleted file mode 100644
index 4a653396a8f0..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop edos2unix qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin +gui +jsonapi +service +sqlcipher"
-
-REQUIRED_USE="
-	|| ( gui service )
-	service? ( jsonapi )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	autologin? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
-	# CRLF endings break patch...
-	edos2unix retroshare-gui/src/gui/elastic/elnode.h
-	default
-}
-
-src_configure() {
-	local qConfigs=()
-
-	qConfigs+=( $(usex autologin '' 'no_')rs_autologin )
-	qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
-	qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
-	qConfigs+=( $(usex service '' 'no_')retroshare_service )
-	qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
-	qConfigs+=( no_retroshare_nogui )
-	qConfigs+=( no_libresapi )
-	qConfigs+=( no_libresapi_settings )
-	qConfigs+=( no_libresapilocalserver )
-	qConfigs+=( no_libresapihttpserver )
-
-	eqmake5 CONFIG+="${qConfigs[*]}" \
-		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
-		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
-		RS_UPNP_LIB=miniupnpc
-}
-
-src_compile() {
-	use jsonapi && {
-		nonfatal emake ||
-			elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
-	}
-
-	emake
-}
-
-src_install() {
-	use gui && dobin retroshare-gui/src/retroshare
-	use service && dobin retroshare-service/src/retroshare-service
-
-	insinto /usr/share/retroshare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	dodoc README.md
-	make_desktop_entry retroshare
-
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_pretend() {
-	if ! use sqlcipher; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 0.5.9999; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild
deleted file mode 100644
index d331568ada6f..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.6.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/RetroShare"
-
-LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
-
-REQUIRED_USE="
-	|| ( gui service )
-	?? ( libupnp miniupnp )
-	service? ( || ( cli jsonapi ) )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0=
-	>=dev-libs/rapidjson-1.1.0
-	sys-libs/zlib
-	autologin? ( app-crypt/libsecret )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	libupnp? ( net-libs/libupnp:= )
-	miniupnp? ( net-libs/miniupnpc:= )
-	service? ( dev-qt/qtcore:5 )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )"
-
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
-	virtual/pkgconfig
-	jsonapi? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
-
-src_configure() {
-	local qconfigs=(
-		$(usex cli '' 'no_')rs_service_terminal_login
-		$(usex autologin '' 'no_')rs_autologin
-		$(usex gui '' 'no_')retroshare_gui
-		$(usex jsonapi '' 'no_')rs_jsonapi
-		$(usex service '' 'no_')retroshare_service
-		$(usex sqlcipher '' 'no_')sqlcipher
-	)
-
-	local qupnplibs="none"
-	use miniupnp && qupnplibs="miniupnpc"
-	use libupnp && qupnplibs="upnp ixml"
-
-	eqmake5 CONFIG+="${qconfigs[*]}" \
-		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
-		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
-		RS_UPNP_LIB="${qupnplibs}"
-}
-
-src_install() {
-	use gui && dobin retroshare-gui/src/retroshare
-	use service && dobin retroshare-service/src/retroshare-service
-
-	insinto /usr/share/retroshare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	dodoc README.asciidoc
-
-	if use gui; then
-		make_desktop_entry retroshare
-
-		for i in 24 48 64 128 ; do
-			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-		done
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
-		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
-		ewarn "instead of SQLCipher for GXS databases."
-		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
-		ewarn "database format, so you will need to manually delete GXS"
-		ewarn "database (loosing all your GXS data and identities) when you"
-		ewarn "toggle sqlcipher USE flag."
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		if ver_test ${REPLACING_VERSIONS} -lt 0.6; then
-			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
-			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
-			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			ewarn "It's recommended to drop all your configuration and either"
-			ewarn "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then
-			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5efbf7a3173a..2ae2a7f2b80b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index b749f0faecc6..5d4ec0e74f35 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2023-05-14)
+# EAPI 6, last release over 20 years ago, no other distro packages this
+# anymore. Removal on 2023-06-13.
+dev-tex/cpp2latex
+
 # Michał Górny <mgorny@gentoo.org> (2023-05-13)
 # Unmaintained.  Does not build anymore.  No activity upstream
 # since 2019, the build system is messy and fixing the issues would take
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 028f1ec0e0d8..11d4df426ef5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -443,6 +443,7 @@ app-editors/emacs:source - Install C source files and make them available for fi
 app-editors/emacs:threads - Add elisp threading support
 app-editors/emacs:toolkit-scroll-bars - Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars
 app-editors/emacs:tree-sitter - Support the dev-libs/tree-sitter parsing library
+app-editors/emacs:valgrind - Compile in dev-util/valgrind memory hints
 app-editors/emacs:wide-int - Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.
 app-editors/emacs:xwidgets - Enable use of GTK widgets in Emacs buffers (requires GTK3)
 app-editors/fe:sendmail - Send mail after editor abend
@@ -6753,15 +6754,11 @@ net-p2p/mldonkey:guionly - enable client build only
 net-p2p/qbittorrent:webui - Enable the Web UI
 net-p2p/retroshare:autologin - Enables potentially insecure autologin capability via app-crypt/libsecret
 net-p2p/retroshare:cli - Enables terminal login support for retroshare-service
-net-p2p/retroshare:control-socket - Enables API via Unix socket support
-net-p2p/retroshare:gnome-keyring - Enables potentially insecure autologin capability via gnome-base/gnome-keyring
 net-p2p/retroshare:jsonapi - Enables the new RetroShare JSON API
 net-p2p/retroshare:libupnp - Enables UPnP port forwarding via net-libs/libupnp
 net-p2p/retroshare:miniupnp - Enables UPnP port forwarding via net-libs/miniupnpc
 net-p2p/retroshare:service - Enables the new RetroShare service
 net-p2p/retroshare:sqlcipher - Enables GXS database encryption via SQLCipher
-net-p2p/retroshare:webui - Enables Web interface and API support
-net-p2p/retroshare:xapian - Enables GXS content indexing and search via dev-libs/xapian
 net-p2p/syncthing:tools - Install stdiscosrv, strelaysrv and other tools to /usr/libexec/syncthing/.
 net-p2p/transmission:cli - Build command-line client
 net-p2p/transmission:debug - Enable assertions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6a97f6542a56..e6360cf4a1ec 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 429233e25031..1e31cd1901e3 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,6 +1,5 @@
 AUX cantera-2.6.0_drop_deprecated_open_U_option.patch 1363 BLAKE2B 236dc4ee368d0c172e372d9e263318460a8b7a3c6fca02e97a0d71fb1852a2bef00c8375e72957d9a5fff2091f3aae968bd73a872509e3890ab91871eb90ae81 SHA512 4f9f18874bab308462261e0efdfdbb1c1f7ad35382aed5a594da45190e18d9264ed314ca4f7cab29d16a83b5c30ba8fdc213461a549ec84bd201211848d63f1e
 AUX cantera-2.6.0_env.patch 3119 BLAKE2B 16844230d86a292c764da1aa4043b2eff177f2b8a94ed154c3f6a69c1737e85f6ddc9330d5ba6f26936994306381dcb40ab4e70c7b7b44bdbaf7d920ee1ef902 SHA512 12cdabc7cee106ee17050918b483245b39f927b5a5bb8f92bd6177c1d660cc18cd3a91b2710991fa09c44f58aaac464495b15ceb7ae13bf235d34a6caabe7bc4
 DIST cantera-2.6.0.tar.gz 2586243 BLAKE2B 3562dc3641c70cdbd5e07062ecee56c0658b098c20bb477c3e741731db01e38fccf624e6769377420b01dd4bac72a0608cf226cce40ac12f13e71081090e06bc SHA512 74e12c89af38236bcc064034f74edcc690895151a9e453e728d130b83f5f527e675750c68a3fe36eea3c6aec6969685aa8828ae740a2e27b5df72a8ccc4d2856
-EBUILD cantera-2.6.0-r1.ebuild 3542 BLAKE2B 212ea3d12fa2aa83430abdd2c700859d59a7ab0e540bd0e32dbd486370d2c98233e071e80e505eaf3bdc5722c953e6d83815d6985411db531d182551124e974f SHA512 62fee7f0d26c328786732ce3f76493d96dac4db944af3d585291be8bb10e1a8de88c24d2e60a3145e67877b568d2963092a09deeea0e6f17b982fe87f849a84b
 EBUILD cantera-2.6.0-r2.ebuild 3602 BLAKE2B 2d4b8da115ffaf5fe402f332a5a9b0a3d22836ad114c70d0d14759dd755ec3a0db55e9f2ca43b65a82e9903893420d1d22cfffab5310b40d10f27b567db27b19 SHA512 f4e4dd9e9d694e2eb380ab6af2b472930b9beb34ae4c2980c32c374bfe799e8e79b3d5a00b276ac953841dff5a3e0ad1cb57a420da4e55f97562b8b7c3464f27
 MISC metadata.xml 842 BLAKE2B 85e2a5268aa13a8a92e9f04212c3bcd66252a77c88dd2ddb7d81a34f486754c7faa352998484d4362b16a2bdccb85325337c13cc272a434be463a037eab846a1 SHA512 a9edb0347dc3b1510d3d2b767e7a0e96cd1d6cc50dd4e5c2830d29438dd25a0bdfa41994dbb43bbb7dc70ba3537f783b2d0a143723908dd91d434e1edb11a704
diff --git a/sci-libs/cantera/cantera-2.6.0-r1.ebuild b/sci-libs/cantera/cantera-2.6.0-r1.ebuild
deleted file mode 100644
index cba332f43a27..000000000000
--- a/sci-libs/cantera/cantera-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-
-inherit fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran lapack +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	lapack? ( virtual/lapack )
-	cti? (
-		$(python_gen_cond_dep '
-			dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-		')
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-	dev-cpp/yaml-cpp
-	!lapack? ( sci-libs/sundials:0= )
-	lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/cython[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		>=dev-cpp/gtest-1.11.0
-		python? (
-			$(python_gen_cond_dep '
-				dev-python/h5py[${PYTHON_USEDEP}]
-				dev-python/pandas[${PYTHON_USEDEP}]
-				dev-python/pytest[${PYTHON_USEDEP}]
-				dev-python/scipy[${PYTHON_USEDEP}]
-			')
-		)
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}_env.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-src_configure() {
-	scons_vars=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${FCFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch="no"
-		## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		system_yamlcpp="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use lapack && scons_vars+=( blas_lapack_libs="lapack,blas" )
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python_package="${scons_python}" python_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}$(python_get_sitedir)/${PN}"
-	fi
-
-	# User could remove this line if require static libs for development purpose
-	find "${ED}" -name '*.a' -delete || die
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tools 'ck2cti' and 'ck2yaml"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index b76681b103d6..3068d2991f2a 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,4 +1,3 @@
 DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8
 EBUILD libecpint-1.0.6-r1.ebuild 778 BLAKE2B 0baecd52fbdd5301ddb2748ecccfffff37f0e5f4b06348bd7011bbb1a62e033bb44b932b449a5d8f5cd8555814101bb4afc005951d21c614df837a551b489ec4 SHA512 7a9363c63aeae9f3442b4e351cbd362988444b28eb54f2d3ac2038ca13f3a8de61579554634cc258af7153a62ae65f2fcaba43fb83d3f1fe4fc4c99a8cd44335
-EBUILD libecpint-1.0.6.ebuild 639 BLAKE2B 30cf652bae08190de475985309283cfeb1d549edff2bb4ccb6bd0c5dbbd982569acc5f744472ae43b11688337294399b2cd3c05950c2d299f53446a39b355d5e SHA512 11f3b36e2ee2983ff361e7d77b38b1a4e7d22a21d33c9169447a57f8dcf37296bc95711130b3a2c1e9e86ec521fb977dc2cfa6c0c58f8dfc13addcf0dc3b44a1
 MISC metadata.xml 639 BLAKE2B 47cb0fcf12a38630e1505734a9aeb173eedd12ba943f9f232816f8283a165099573036bdc9e51d0d4d6866e965bc508253c5fa458905271c58311d6d464f3d27 SHA512 58e24471675a7f813f6cae2684c73b4f0c08c6e9379209e0a809e0621f72c7ae29ad15d387defd06989bb86cb257d5c874d1fa80f2bfa8ef644be05e38fe977f
diff --git a/sci-libs/libecpint/libecpint-1.0.6.ebuild b/sci-libs/libecpint/libecpint-1.0.6.ebuild
deleted file mode 100644
index 47004ee7019c..000000000000
--- a/sci-libs/libecpint/libecpint-1.0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
-HOMEPAGE="https://github.com/robashaw/libecpint"
-SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/pugixml"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIBECPINT_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 560d7fdf4807..b4a56121390d 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -1,6 +1,5 @@
 AUX libspatialindex-1.9.3-respect-compiler-flags.patch 526 BLAKE2B 25ab85c15666fce87c42513c22eab503f2e6617fb45484a7beef69690e4affac2607506f3ffad87878e6791004717aefc43468d50263dfd21a16a176ad008045 SHA512 bbc71df1e53f35415ce8e88c3003a88920f526f96113da2dfa99eda3a3a49b0913d839aae3d95cf7a51d2e93332e49410b214494d7467f3d07025c7fb5551b87
 AUX libspatialindex-1.9.3-use-system-gtest.patch 382 BLAKE2B 113e93e5d5f1524929c07f483f9df53d7b2b7b44bb104ae10564da0a9570be28b0da50ba12c8ed8879be782ff1df9124c85ff3884a4a683f098ebf7db83490dc SHA512 2eeb7f48e7adda39da8338d370d7278b9294f402ccd5506db22c94a5ab561e09429ef0f14df0d1befe9423d18413223814f86122810deb23b7b5e06459841e60
 DIST spatialindex-src-1.9.3.tar.bz2 520817 BLAKE2B 89bbb4ef76f620042cbaa2822daad1459bb8a3801fcdedaa73fdc666efcae0e5329e15e79607e3a31ef9a651fbbf9d3657f5bada19b229eaf37fe232935b8dae SHA512 7922807a2f7026542a014d3d7943da5410429b291cf469267ffea5b8075eab2a94e68b6c013425615d221b930fd319c403f3bf43404c9b1d2c92d0e2baae3066
-EBUILD libspatialindex-1.9.3-r1.ebuild 807 BLAKE2B 9ae03aa69a90294ebc560a77d46ce710a142b3e39dcdc73049e24b322049a8917cd26d4c7e2403db880b13668ff3d80ea86124b85a0622f0b1ba9a6e9aea619f SHA512 e5170c49acf772763690a54e282a5dd805fc45d44f09527632f919086678a185e3644254c719d7e70f11a4a4df9f7bbcd203966fa56424a5d1c0665df503142c
-EBUILD libspatialindex-1.9.3-r2.ebuild 947 BLAKE2B 8b0ef83a1196e249c70dd7a1b3fb42b37abaece4b6bceb60fc05d1ec369f02416a19f219402b222d099726fce5ee78227e312949e6d4a033f65cb6d871d7aa97 SHA512 ba4d9f0f4304c0debadc948cca1918fd3dbeea7636c02af956b2c76e6613b4cfc5eeea115f4d35212bd7c9044f0d9f7752d869cb5560b5b9507aee656aac3002
+EBUILD libspatialindex-1.9.3-r2.ebuild 945 BLAKE2B dcb77eafabd1f083e1927d4e44fc5e22ba22c58a9e16f64ee4b7dacef08442ff962877e465518a1904bc10770f499691215ebe8480b951344726a7378c0abd6a SHA512 5b6fe6d6a58ee0ba968ab4d291f6ffbca85fcdd58b1c73d7fec778b52b6e7b0e0855ff0ece05eb6ce84f7cc31cb4850147608e117e8926cc65fe37cc7dad170c
 MISC metadata.xml 509 BLAKE2B 8ceda1e32220335480bb2f700a73e2a12457a77e9bdeefd0c67e7859569e54879a238735f0dddc673739c2affed542e9bef67c498a4ac3af1c09cd287af94bf6 SHA512 80e5b87ca4c0ede5e48381b4f51e9a8ae150f77bc5eaceff5fda645c3f8d3eb482825ab8a7cd5701f8a1f889b7c5fa68bbe1a3ceeac6e03df79944da3016942c
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
deleted file mode 100644
index ab14fc05522f..000000000000
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-MY_P="spatialindex-src-${PV}"
-
-DESCRIPTION="C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API"
-HOMEPAGE="https://libspatialindex.org/
-	https://github.com/libspatialindex/libspatialindex"
-SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0/6"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( >=dev-cpp/gtest-1.10.0 )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-compiler-flags.patch
-	"${FILESDIR}"/${P}-use-system-gtest.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIDX_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
index d4063f6d21df..0b81b51c3059 100644
--- a/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
+++ b/sci-libs/libspatialindex/libspatialindex-1.9.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libspatialindex/${PN}/releases/download/${PV}/${MY_P
 
 LICENSE="MIT"
 SLOT="0/6"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 543be0235736..524c95684aab 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,9 +1,6 @@
-AUX ocv.patch 1361 BLAKE2B a1d019c791e4d5d1fd9546fd5756f18a695ad3702c2dae9b83e989723a7aef497eeabc46058f151984e7e6c8e8134fa0f256cb637587e063496bf6becfb72c19 SHA512 6573dfddad74d5b75e59df6122fe42701e5b4e72b4d52c6c0fb41dba207d3261edd27f9e6ec3e548b42a70f65e37cb72615259402b391ebff1a8926c12a63964
 AUX vtk.patch 507 BLAKE2B c6de651fa6bf13fb650f40232d27057f1bea78e2f3b45b2a6576d25bbde33bd3fea0b518f3317aa58238452e338f92d1f35f584017fb6a805cbb33230605a8a6 SHA512 c9fcb0352dd81c4440da0a8e4664497aebffa6c81e295cc304a43fa43b984b97d23d5dedd84b4d16dd979d509c7882c35aebecdb191b6c33c32b9183c053ad6b
 AUX yamlcpp.patch 675 BLAKE2B 269eb1d6f0e276cc6863d4ae8e8a3c73c6264b681a76f9bc32db185ed0c7b3a115b0fd1871569ff0ddb34dfd10c5aaafe658a620f70e4964bf196fd6ad57780c SHA512 fa8aabe06b75c2fdd3be222c4c51de6c5bc9ca9f2444c4e97cb63c910bf572f616cf0ac6381d4bf0a5f5fe07cb520eb6f748a4fcd19cf7cdd89f76a52da6a5bc
-DIST rtabmap-0.20.18.tar.gz 21545395 BLAKE2B 1cd7727cc499f0c78fa62f94fca4517e9a5f1eb79e0690683da1c61536542a6d3e342794f4282c92aa725be221fd88afb1f730cc8e431bb9ac293bd73e7146cf SHA512 313b95ba741ecbbec721ce3c339b508e75578f2b85f23739d22ddda5be28c03104e9bb6c4ab8a45ac2225bd72c7b9e84b4c5a5ae7bd4d04b1bb054566be23fff
 DIST rtabmap-0.20.23.tar.gz 21922099 BLAKE2B ed254beea19b635ffad6e09edd8ea8370eda633dacd3dfcc273b6b750685ac4dac8b57ee91d273eef21c23f4b057cc401354a8a18d2e93ec2f6564bb84c59c0f SHA512 bef7140d569cdb3a86d329b79d410feeb5fe3291263e3be68a62270f807c102b5911946d50fb2f084b8a76eaa7e486c5819dc29ef1c71ef80ac3d5ee41910942
-EBUILD rtabmap-0.20.18.ebuild 1541 BLAKE2B c30a4dd87b128e3f95b9efe8711a12cfcec05c08f727f97f2743ad92f332572a41445509c64476d3f8d2acb2ecac159f0872afb1d320552498ebfb3b77ff60f8 SHA512 42ce75938cf5960752a8cf1ea3e5b75c72480634c6d6b1df33baebd276ce060c9046fb30c732338ae2bc65c3e4627a8ca58f5713de0579e6b906a70df43c5038
 EBUILD rtabmap-0.20.23.ebuild 1541 BLAKE2B 251451eb169e84f70109f7f43220e24187bd13089858e2de4005223ac6811a80f31b945512dcf4f68cf469b51878416b9323ee267aa0a7830b249d4eef3fcf15 SHA512 e84a9ab2203e9a45455da222a9d91fd48846c58a994425c32c7467e65ca0e260b4d11fa46306f47fee8d5701d4efd3de52236ab62f42c971d84a2b1aa18a7890
 EBUILD rtabmap-9999.ebuild 1517 BLAKE2B f6f415f78c97b509432c136a7f94880d66225fa046efc34461fa5041ccdcf2c69ca681498b7cf4465b3df525af9fd6076d1f8b09ab1425bcd63f85584aad28e5 SHA512 47a8781ad4605bed3ef323d870287ac654d393794e261e6e4a5e40f382bb4b7fd7678824a1dd5a4b17943f746c55b15c1959f3d822a15936d002c6e10f21ea99
 MISC metadata.xml 472 BLAKE2B 141f2e2a39f7e3e8543c255995ecc14ee3168985e47a4c0882d32fdd884a81ca0aeade5a41092ce5525a54a0ac2802714e2c6031c09af9671682231378918c64 SHA512 a472fd8de805c23ebf8de91fdecab35cb5af78bb971ad10f8e4b23ab97efaffc3f7fa3ffbec457ab120d3fe75f4d021079a67d426f0df022be389f00bc311651
diff --git a/sci-libs/rtabmap/files/ocv.patch b/sci-libs/rtabmap/files/ocv.patch
deleted file mode 100644
index 642f2e1e911b..000000000000
--- a/sci-libs/rtabmap/files/ocv.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cf64b20e1fd5b7aca6f5f708e9b790aa41e799db Mon Sep 17 00:00:00 2001
-From: matlabbe <matlabbe@gmail.com>
-Date: Tue, 10 May 2022 22:47:15 -0400
-Subject: [PATCH] =?UTF-8?q?Fixed=20error:=20=E2=80=98drawAxis=E2=80=99=20i?=
- =?UTF-8?q?s=20not=20a=20member=20of=20=E2=80=98cv::aruco=E2=80=99=20(open?=
- =?UTF-8?q?cv=204.5.5)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- corelib/src/MarkerDetector.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/corelib/src/MarkerDetector.cpp b/corelib/src/MarkerDetector.cpp
-index b59cb9468..2a3957f90 100644
---- a/corelib/src/MarkerDetector.cpp
-+++ b/corelib/src/MarkerDetector.cpp
-@@ -304,7 +304,11 @@ std::map<int, MarkerInfo> MarkerDetector::detect(const cv::Mat & image,
-                 std::map<int, MarkerInfo>::iterator iter = detections.find(ids[i]);
-                 if(iter!=detections.end())
-                 {
-+#if CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && (CV_MINOR_VERSION >1 || (CV_MINOR_VERSION==1 && CV_PATCH_VERSION>=1)))
-+                    cv::drawFrameAxes(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
-+#else
-                     cv::aruco::drawAxis(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f);
-+#endif
-                 }
- 			}
- 		}
diff --git a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild b/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
deleted file mode 100644
index 61f45ae6ab9f..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.20.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake multilib
-
-VER_SUFFIX=rolling
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-${VER_SUFFIX}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P}-${VER_SUFFIX}"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk,qt5(-)?]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp:=
-	ieee1394? ( media-libs/libdc1394:2= )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/yamlcpp.patch" "${FILESDIR}/ocv.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index f6408a030ca9..02d7cca01c24 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,10 +1,7 @@
-AUX sundials-5.2.0-fix-license-install-path.patch 468 BLAKE2B e2c9963f3c528cbe84a00e9ad98511bc6bfee8cd5d18c7d94661e25ea7cf6feae3c510a3c8532de61f40a2c351597ddee40a0c3fd35cec85002b9702352cbc3f SHA512 33c16064576d28d1768ec1c7232b5f1d9dbb786e24a390d970ba05b1b14df1b5589e6d6857ef84e66f2e4541a995509754f1abcf55e9e2e6dfbead81233efd8b
 AUX sundials-5.8.0-fix-license-install-path.patch 874 BLAKE2B 134158ced2c1850aedb7599f6c2de33adc7b63f60ccce831f494006b41664acf31ccf838ca9715c4470309648935b194a0706f487cdc6e4b1a3ba52c0ca3c941 SHA512 7775dd78cd4dfbf647087058126314305232657c6f32d4811bc181902d925cee51142e92e2f50c15c02475b2b6c4f1c7be70a223dbf838b9205a811ed9fca4a9
-DIST sundials-5.2.0.tar.gz 18639221 BLAKE2B c10e6deb5839993b8601347be94412d0b0c058084b4dc0d380681f7b4debd535f9736c2ef734e9fd84c6ddc190ab05f46abcb711225ec1f156a18d8edb6317fb SHA512 99163a104e436dab4779c77519502b5614b65d726324b29b14236315f6916beb5863fcd56b5acf19f62985c033b227fba1ebd3d3c4607ce991d94ee7739bb55f
 DIST sundials-5.8.0.tar.gz 24012815 BLAKE2B f707ad7465218532f3dc4df7627b87933b2bc52be6f1ad290b91ab83a3414ae83bc64503126af8772daa000f58a89855d7ca35fe74fa21bd91180695582442c7 SHA512 d22e699aaddaeef026e91e18dd070d06278c75b6980b36c6fb2e50203ba6445420e4a8e0612a6317dcaa521aeffbdf62ab88737be235ef70cef3a8be02a13dbb
 DIST sundials-6.2.0.tar.gz 82410068 BLAKE2B c6aa9735198465bb458590ef1a90101e246202632afd6bd7f48970b9a2752810ce8c5be7983097cd816189cb994efbddf8d34706665846c67d6442bd7c12db38 SHA512 0dd0a2bf6390a13a5846caf440aa6d459f3890f6d13c0eff8c8180a92a636d6eae7f64679d45acd2048de742d4c644e2ae112cb09028b3fdef10a247bee44c0b
 DIST sundials-6.5.0.tar.gz 89142911 BLAKE2B 3605686f813928fe55e5aafd409c478cf782411b5d2e510121fe15cc15eae84a5d0fe7470c7c0c976fbe11e7f0fd0e9fb449ae45b4c34aa077ac1acb25255cf5 SHA512 30ad3d3f998df6a6381a14b0c8fe247a5507e386ed1b9b55afae87b976f15026d7b4e8609c3cf8423ad79e1b55bade40dc66b274dc3422e040cb12fec981d502
-EBUILD sundials-5.2.0.ebuild 2173 BLAKE2B c7765f5fbb12395c2474f352a3200225cb2ec75360fa2089bf34ee0ddb313d136b0e66ad1955936bac2bf6f6e63bca055e7077d46fb92a69771417c51b86fb9a SHA512 00d5b62fabe026e5637cd655dc53ba12e4ff8db286b451e79a993b18ef09dcbce58805424c903bfb35ebbfcd2881873f91cfb63faa353f1789bd95fba7f17a17
 EBUILD sundials-5.8.0.ebuild 2759 BLAKE2B 2f2872218e337cda6e067925f4f67ce4021a284d0d4badb31737efd6fc0917808769c24b74df4086aaef08384bd36dd744358b9d797da08c40d34f5b1aa34bdc SHA512 7cdaed08db6eab4713df5477d3051d009881cb1ef38714496618f56f831ab9e3973a0b37092cc716512c5d8dc6ed73cbb7da2fb46d0373b066290c48993cd805
 EBUILD sundials-6.2.0.ebuild 2723 BLAKE2B 3d0bdf7847bb61ff87b78a3fdc806d3edcf9d72422d5c27dc05c69ffbf69a609777e25d9b2931bd11b70c911de76e84dcb06843f39aed05f5c76d56474abf78f SHA512 a3e17643240fbcb9383cccf5b90122f53f19d27213d978aa0315db52e1afa20d8c0afa57a52f6315a7050f8112e0f03d558d3b60448bc661cc4054a328ed6ff8
 EBUILD sundials-6.5.0.ebuild 2665 BLAKE2B f1c6007a8a6ee04e9ee281c224a9b285291fcd6b1ec16091744f2a16e515d4fc059e2f7a932be4dcfc67b86ecbbbc672259a9c7d7619a3ca3755e6add3628165 SHA512 e09f37403f2762d086ca901982eb960a20c697af573f7753e4b0dae61513d3c6ddc6a7dbfc9bb7623f50d94c1a06d8958cd9da58fcc49b321c4bc87437ee3553
diff --git a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
deleted file mode 100644
index 8fb6c977ca76..000000000000
--- a/sci-libs/sundials/files/sundials-5.2.0-fix-license-install-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-04-01 00:03:37.000000000 +0300
-+++ b/CMakeLists.txt	2020-04-21 13:27:58.000000000 +0300
-@@ -1146,9 +1146,9 @@
- # install license and notice files
- install(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.2.0
-   )
- install(
-   FILES ${PROJECT_SOURCE_DIR}/NOTICE
--  DESTINATION include/sundials
-+  DESTINATION share/doc/sundials-5.2.0
-   )
diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
deleted file mode 100644
index 5af24cd4ed75..000000000000
--- a/sci-libs/sundials/sundials-5.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-# if FFLAGS and FCFLAGS are set then should be equal
-
-inherit cmake fortran-2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# bug #707240
-	append-cflags -fcommon
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="-lsuperlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="${EPREFIX}/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	use sparse && mycmakeargs+=( -DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so" )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc doc/*/*.pdf
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index bef7e3fad997..9ac50ee9d696 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/wxmaxima/Manifest b/sci-mathematics/wxmaxima/Manifest
index 407ba1230431..12a2765eec43 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -1,9 +1,6 @@
 DIST wxmaxima-20.12.2.tar.gz 16262617 BLAKE2B 2f9f910f565158b2011f014d96747498c6286a95bdb69f9b6b2f82a37a569e8a02abbae5cbb9ae2ac1e78d0b976487666794b267c1c40c1245df08c752486403 SHA512 1c3e3f68a2fa2cd798dfb05c52e7ddf3193a15cb45282553c280914bd524d463ad27acc89898cb4a292ff236699d1ec2abb70d83fa52cb126123ab8e2fcd5ceb
-DIST wxmaxima-22.12.0.tar.gz 23673254 BLAKE2B b00536c6b6243555f4c00016202d68f9764a2e1ec4c910ee52d7e0b498a5695c3f4746809e594179cda75ec40caeca1a01e21a11c211c329ec2685a8e6217e4e SHA512 842a4c891d757d17307a9bed17f5ffffde9f55e72b749e2356817a1598760b6a16fb9ce8e21f4706530bbe2360400de01b9269872d895944924d8e3eebfc31dc
-DIST wxmaxima-23.02.0.tar.gz 23662128 BLAKE2B 10f8a155db9bc3889b9f79892d583e666c6ff250e669883e3fa8f65a91928a38b69df059a9358ca3a1f87a9d915fbb8d8ddeec5bfac21ee8ab3b59869d0cb3cf SHA512 7f30ea7be25269d670b14189b84777e12157209ab20d6f77fa9428743c002b235a09bc732bf253a0c1a0d4618986051bab68f2ec9d360b229bb7fbd6604af9df
 DIST wxmaxima-23.04.1.tar.gz 22060726 BLAKE2B 77583c2461f7c32ac53ad2890d1e7d07a9fc2dd0caa07a1fcdd7c62d39ec63c50173542c74ce2d21093ce724d1777b76e7789f8a5363ff20406d52177c86a016 SHA512 9846c11cbeec8411170e0d55916187cc77274e2758726784bcb5540d55f712b5a557562de0c37dac0c7ef119d43570bd33efc33252fc5359627e527d668580a4
 EBUILD wxmaxima-20.12.2.ebuild 1428 BLAKE2B 30e26a147fe84b328902bedb1ee7df68a6c27d203b9b6e900096d931091ce51cce41d22e45fe779bb4144949b1ebcf259fbd085cc4e2f992e495405c5176410d SHA512 823b28ad77dfa70536103b64735ec68cdefe38abeec760b15acb6904f7f8f97d6ace10eec836f0536ff576f7711b2d135a989072087ae67d133506a301920882
-EBUILD wxmaxima-22.12.0.ebuild 1901 BLAKE2B 7c6834bf45bd13bc889fd06a0b115f79b3d71f913f3a982af15eee7130900d152058c817e4908112d52d0f6a9dcb1eabc2a99987ea9e5306b8205fa68cf780e2 SHA512 651f5d701a5d346c744fd15d2094545b61615a3837d53e1b124be0507b4f5c29ad80bf98a1c1691645ec0caea851093cf7250ad9d9a94fc54bd722f15df874ec
-EBUILD wxmaxima-23.02.0.ebuild 1901 BLAKE2B 7c6834bf45bd13bc889fd06a0b115f79b3d71f913f3a982af15eee7130900d152058c817e4908112d52d0f6a9dcb1eabc2a99987ea9e5306b8205fa68cf780e2 SHA512 651f5d701a5d346c744fd15d2094545b61615a3837d53e1b124be0507b4f5c29ad80bf98a1c1691645ec0caea851093cf7250ad9d9a94fc54bd722f15df874ec
+EBUILD wxmaxima-23.04.1-r1.ebuild 1901 BLAKE2B 33ccd0d0c93571d76bfee6727b62a826388cbe39d1b757ba81f9ab77bb2d05994b675e22f6d73829837e2fedf3396ad4cc2ad28c0bdc85c6221f7825c0bb008c SHA512 c33a36b8cde439d4a760d3ba328c8a52c51fb7b29f79e67009e5bb25acc535983c6d3738ed1f09fc9d2398396522f9abacdee98598e2e510d3d1ffcf66c83838
 EBUILD wxmaxima-23.04.1.ebuild 1901 BLAKE2B 7c6834bf45bd13bc889fd06a0b115f79b3d71f913f3a982af15eee7130900d152058c817e4908112d52d0f6a9dcb1eabc2a99987ea9e5306b8205fa68cf780e2 SHA512 651f5d701a5d346c744fd15d2094545b61615a3837d53e1b124be0507b4f5c29ad80bf98a1c1691645ec0caea851093cf7250ad9d9a94fc54bd722f15df874ec
 MISC metadata.xml 736 BLAKE2B fb5db64266afc69d42ab7ca857e9022d20e5306d04403859c847caf8d36953820ad9920212f164a74c1e2a807b111c0cffbbdfd4b098049e3bf689a9958b0b6d SHA512 318a52fafba636ef7439d52b936a3aa144e810077e381d367a8d1cc12529e085a3b84f873591ee9f9b613a5f71285a1f1f5b3ceedbd619e79c717a375e3c5e95
diff --git a/sci-mathematics/wxmaxima/wxmaxima-23.02.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.02.0.ebuild
deleted file mode 100644
index 552ce4da0c45..000000000000
--- a/sci-mathematics/wxmaxima/wxmaxima-23.02.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
-inherit cmake plocale wxwidgets xdg
-
-DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
-HOMEPAGE="https://wxmaxima-developers.github.io/wxmaxima/"
-SRC_URI="https://github.com/wxMaxima-developers/wxmaxima/archive/Version-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-Version-${PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-libs/libxml2:2
-	x11-libs/wxGTK:${WX_GTK_VER}[webkit]"
-RDEPEND="${DEPEND}
-	media-fonts/jsmath
-	sci-visualization/gnuplot[wxwidgets]
-	sci-mathematics/maxima"
-
-src_prepare() {
-	setup-wxwidgets
-	cmake_src_prepare
-
-	sed -e "s|GPL.txt ||g" -e "s|share/doc/${PN}|share/doc/${PF}|g" -i CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-	sed -e "s|share/doc/${PN}|share/doc/${PF}|g" -i info/CMakeLists.txt \
-		|| die "sed info/CMakeLists.txt failed"
-
-	# locales
-	rm_po() {
-		rm locales/wxMaxima/${1}.po || die "rm ${1}.po failed"
-		rm -f locales/manual/${1}.po
-		rm -f info/${PN}.${1}.md
-		rm -f info/${PN}.${1}.html
-		sed -e "\\|/${1}/wxmaxima.1|d" -i data/CMakeLists.txt
-	}
-	plocale_find_changes locales/wxMaxima '' '.po'
-	plocale_for_each_disabled_locale rm_po
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWXM_UNIT_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Just run the unit tests manually for now as tests fail in a non-descriptive
-	# way even with virtualx
-	# bug #736695
-	cd "${BUILD_DIR}/test/unit_tests" || die
-
-	local tests=(
-		AFontSize
-		CellPtr
-		ImgCell
-	)
-
-	local test
-	for test in "${tests[@]}" ; do
-		./test_${test} || die "Unit test ${test} failed!"
-	done
-}
-
-src_install() {
-	docompress -x /usr/share/doc/${PF}
-	cmake_src_install
-}
diff --git a/sci-mathematics/wxmaxima/wxmaxima-22.12.0.ebuild b/sci-mathematics/wxmaxima/wxmaxima-23.04.1-r1.ebuild
index 552ce4da0c45..eb18fbdaf093 100644
--- a/sci-mathematics/wxmaxima/wxmaxima-22.12.0.ebuild
+++ b/sci-mathematics/wxmaxima/wxmaxima-23.04.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-WX_GTK_VER="3.0-gtk3"
+WX_GTK_VER="3.2-gtk3"
 PLOCALES="ca cs da de el en es fi fr gl hu it ja kab nb pl pt_BR ru tr uk zh_CN zh_TW"
 inherit cmake plocale wxwidgets xdg
 
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 3bf8c6502d22..00743b26d34d 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index 95d5003da312..68d0b529f46d 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -2,9 +2,6 @@ AUX 64gle-gentoo.el 191 BLAKE2B 710428a55c0c17baded6cec2b0d4a20582fc3a91278f27ee
 AUX array.patch 581 BLAKE2B 9f7eba9c7ff8496059ad24cdda171f745db58a145d661338f5f3bf76c7863c2d1af8f879409f330ee6a163042fc0eb2f102e9857a2d15f9fcb06eb61a0394d61 SHA512 fa9760e4a07efb8c3fba372a9c11edeed06c563e9742001d388d2083f93b4b64f6e5e2ddef64372566630cfff9c59292455baf30bbbae5c0d7f426860ad1195b
 AUX cairo-pixman.patch 1178 BLAKE2B b38c5ed332bf13b366df23277d999e648d67e861a4f227e14be6e6e448fb86b57a26c10d9909a25f2a45105a01f57a99cf1cdf75ffea66dca0bf3cc6e9dc6124 SHA512 52c9b2e538111f84a1f127717d3c96d75bb4cf138547fe97dfbbf563d06e50e92963d045b2396c01f83e48190638b9007843e51d6afe345e9404402fba5e307e
 AUX ghostscript.patch 972 BLAKE2B 3750321b5093400595070290c9c9af948eae797e6365be982c82716000a5176df641888783d99b640014f9d5310c94c9c1ebbd3ac091ca4076b7b92b923a78b3 SHA512 063bb97c177e4c47d51649056cc30aa14a5f7df664e19a15b8bd5d337b14a5ad4f5d318301fcc33823aed9cf5b5af070949861c0ce8f857f59a6f7ba951a1d88
-AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367
-AUX gle-4.2.5-jpeg-9c.patch 685 BLAKE2B bfcb90439c6cdd2bd75b9e5d30232dd816f348dfdf9ee7067e848741c4050a441869e04513ae04f92569ad3854a77fe9c739be6ebd1ca5ff5988af6ba5020d99 SHA512 55c1f8fd59cbe71b14d1755bceb5fb02ebfbf0e71eafc39837b513ba48be7421c51352c60d127fc4744628eb6e403eadb703bf24a49dea5652c08ae749a67590
-AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
 AUX gle.sh 65 BLAKE2B 8e045866b0d20a77e3e2de050d90f0b0f8efa3a57481ecf2b01ad3c0f81d5ecd9e4d054b20ca488f282dbd111b6997113232fc984d628d9d9b60e3287511b912 SHA512 90ca83947538d2342702ea60974780a3f303c223989a43f5fe117b5d97b650827d074adcd011a15c0716b3a9cd54913a661ebe59a3afba06d51e0a889f14fda8
 AUX install.patch 821 BLAKE2B b8ca829a3e5f3fa96695ba28ff7e7170badc5a3f8f629a91cc6f2f16db5a5b3c0b18cb5c361e96f449304cc793d8e14f93c2c06b5ec7e27649662f1daad9f554 SHA512 1d22cdb507e3322c61bc69ef8ce12b32a9b58a2c6b634b7282d795e5ab66a10d19525e15351dee6a2ec136773ab28952de87cd10216c0acb782f2f441a3dcddd
 AUX lic.patch 329 BLAKE2B 75445082d509836f3ff7d5c88c182486d2fdeb22cba77a96ee879073b5e6865ae2522978ef73f715f11cda323d51bb763e4189eca8aab213e4dafeaf6b33a4f3 SHA512 858b7dc4a226a48d3ee5692ab58db5975f202ffe1a885eb0e5272c359d3f9020fd38b9ccf2f1d605f90b6d749dc1674650e020d7eac99b4a4bfd808c47ee0052
@@ -12,10 +9,8 @@ AUX link.patch 635 BLAKE2B bf4f93fae6dd7d8a14b3f6bd180a1e275511087fc3b8acd7c8b2a
 AUX wayland.patch 347 BLAKE2B e4bff5717aee0ea83a7fdb7047a0363c34a225809246f33b7da92b9f535d9e412047bdb9e22436629bbc7b11be55838e64f624e870c4f60f4634d28aac21e3d7 SHA512 a51b030de9ffc7fd83e04271a191ba352cfd670a149249c0bf6415d4583c8402a4cc6930aa849bbab2d8c11f4934f21ffdba36c8fc78ba235ced6e2b9ca0b03d
 DIST gle-4.3.3.tar.gz 1788614 BLAKE2B 3f608a8dad32d02b06808d5b2cfe4a2beb2c076c74e2972be2e94fe56bf24190b9cc7c69f45f1b02d399354f827c43722029871d6355bc0e4abe003f71b2bf82 SHA512 191dde025828f3376c7241e0580fcd459c743fe947f69cc3be1345b43c1d2587852a0d002dfdab7d8b7b45fd30e6bf4e8a4b5c73bcc2f3ce2fd08aa41d799b03
 DIST gle-c++17.patch.gz 18738 BLAKE2B e0d91aedf2121897336be72d8ad5878be95cf15982b38efb2fda86605d6e0f01b792013a9ab6407692254e5c074630daede05bcf97f349541dd979b21eb2ff15 SHA512 3bc4e335577f94eafd140cd64f2ada1926b1679c113de1f0bb0dd1afed67210470340470b19d89dae4ae1ef433f05120332a465711afb4e637e3cf0c6db68ace
-DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
 DIST gle-library.tar.gz 1073620 BLAKE2B 051f9584dbf3195c7598ae54b12ab8d373e8054e8ff4c3d1dfed70319c29c5cb8bb1f0baff127768bcf9e36e4f52be3b3238e786e1598d1cdfbd6d1af6d6bdd3 SHA512 af6a46f2bd945714679eb9d8ca4c70ca9a741cf6652590eb3a8d9422059f49ce3d2c33418c37899bd54f9e0bc0085ae82ffd2f2b84b77879e2f2d09a0026d12a
 DIST gle-manual.pdf.gz 1878050 BLAKE2B 6ebd3c0214ab8aee3e5a32d1e1cdf1c001cd09325c80a506a1e41f4eb3ec8869b75083c741a5cf8b2f3faf1d2cb0c6cfeca835daa284263598f749109904cc11 SHA512 7cc796626fa19541558004250a4a5b206ead7ba704c76fd948693aca144e70926b8213ee8b062841bffedc631eb39a255d69387bbee4a5acc7edc6d093e3113f
 DIST gle-mode.el.gz 7359 BLAKE2B bcbc61651f87f3ee1d079fc0a0de38788523a5ee33f56087b89f4e15b9ef5ee4010cf47679c38da3dfae1954ddbfee4728d10c0af6530f645ff63ab2b219da09 SHA512 c8d291c23f53346d8a44b7d95d737da88c6ec0af597fb8298a564a5567a9e9a0db658d14c3cb43157d58614e65cf2293eaeb01528a7a49722a2da07e16f940e1
-EBUILD gle-4.2.5-r4.ebuild 2167 BLAKE2B 0a2d82e70c113d95e22620ccc4689a2cc361226fe044fc59a8635866ccaab62c475d9947aef9586c38e0173ba3ee86626f9db44ff83689c816000f9234991462 SHA512 5adcc01b7eae8c4e796ff32efeb74fc46b4ee2ff27f2145653012d2e1d1fac99c97216b8735409d73524da1f4850f5d4f3958e0b0d762103ad479626973d39a8
 EBUILD gle-4.3.3-r3.ebuild 2469 BLAKE2B 14d223de9a2bee0d41f9f48efc97d38458268bd6ca84c31806786ee3187c2b6ef836bb038eaaa6e49fb5b551fe7ca5e0fcd13bb31aca7ddea5dfdf11a1cbc697 SHA512 34e00d60b5bc676d76d7c91dd89e2e56378ff28273ef7926ece9a2538c4ac2b04908957041fc165a58bb6f1914bb7cae872a9e9a44172fe7a5542ba934a370ad
 MISC metadata.xml 758 BLAKE2B ea6e049fe37e4fc4cc9510774bb13ec9d2107ca1e4078a9bf22afadb59a375ced01aab6cffc674bcce01e4e51960db830e7a381600322f903f6b1407cd11ae13 SHA512 953fa5de474729f4196392b9ccb09d9a07799c26d5e5ef3422bc8e737bb666c8bd66e1931c225d049e30be31fc427909225d5457b95c78de2f2073d0108d2620
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
deleted file mode 100644
index b548816ae065..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-c++14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
---- gle-graphics-4.2.5.orig/src/gle/fitcf.h	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/fitcf.h	2018-01-13 13:57:23.140749391 +0700
-@@ -182,8 +182,8 @@
- typedef struct Namelist Namelist;
- 
--#define abs(x) ((x) >= 0 ? (x) : -(x))
-+/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
- #define dabs(x) (doublereal)abs(x)
--#define min(a,b) ((a) <= (b) ? (a) : (b))
--#define max(a,b) ((a) >= (b) ? (a) : (b))
-+/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
-+/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
- #define dmin(a,b) (doublereal)min(a,b)
- #define dmax(a,b) (doublereal)max(a,b)
-diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
---- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp	2018-01-13 14:08:08.169722265 +0700
-@@ -49,7 +49,7 @@
- #include "f2c.h"
- #else
--#include "f2c.h"
- #include <stdio.h>
- #include <math.h>
-+#include "f2c.h"
- #endif
- 
diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
deleted file mode 100644
index c5dd2205dc43..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/647626
-
---- a/src/gle/gle-poppler.cpp
-+++ b/src/gle/gle-poppler.cpp
-@@ -194,7 +194,7 @@
- boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) {
- 	gle_jpeg_term_destination(cinfo);
- 	gle_jpeg_init_destination(cinfo);
--	return true;
-+	return TRUE;
- }
- 
- void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) {
-@@ -237,7 +237,7 @@
-     	cinfo.in_color_space = JCS_RGB;
-     }
-     jpeg_set_defaults(&cinfo);
--    jpeg_start_compress(&cinfo, true);
-+    jpeg_start_compress(&cinfo, TRUE);
-     JSAMPROW row = new JSAMPLE[cinfo.input_components * width];
-     JSAMPROW row_pointer[1];
-     row_pointer[0] = row;
diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
deleted file mode 100644
index eeca1f5946ba..000000000000
--- a/sci-visualization/gle/files/gle-4.2.5-parallel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
---- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in	2015-08-16 13:51:24.000000000 +0600
-+++ gle-graphics-4.2.5/src/gui/MakefileAC.in	2018-01-13 14:23:09.066684378 +0700
-@@ -83,12 +83,12 @@
- 	$(QMAKE_PROG) $(QMAKE_OPTS)
- 
--domake:
--	$(MAKE_PROG)
-+domake: Makefile
-+	$(MAKE)
- 
--repmake:
-+repmake: Makefile
- 	perl ../../platform/autopackage/qt-replace.pl Makefile
- 
- doclean:
--	-$(MAKE_PROG) clean
-+	-$(MAKE) clean
- 	-@$(RM) qgle install_qgle_name_mac Makefile
- 	-@$(RMDIR) moc
diff --git a/sci-visualization/gle/gle-4.2.5-r4.ebuild b/sci-visualization/gle/gle-4.2.5-r4.ebuild
deleted file mode 100644
index 88e3c6d80dd6..000000000000
--- a/sci-visualization/gle/gle-4.2.5-r4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic
-
-MY_P=${PN}-graphics-${PV}
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="https://glx.sourceforge.net"
-SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 emacs? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs jpeg png tiff vim-syntax X"
-
-DEPEND="
-	sys-libs/ncurses:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	virtual/latex-base
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-BDEPEND="doc? ( dev-texlive/texlive-latexextra )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-parallel.patch
-	"${FILESDIR}"/${P}-c++14.patch
-	"${FILESDIR}"/${P}-jpeg-9c.patch
-)
-
-src_prepare() {
-	default
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# CPPFLAGS are understood as C++ flags
-	append-cppflags ${CXXFLAGS}
-	append-cppflags -std=c++14
-	econf \
-		--without-rpath \
-		--without-qt \
-		--with-manip \
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake
-	use doc && emake -j1 doc
-
-	if use emacs; then
-		cd contrib/editors/highlighting || die
-		mv ${PN}-emacs.el ${PN}-mode.el || die
-		elisp-compile ${PN}-mode.el
-	fi
-}
-
-src_install() {
-	# -jN failed to install some data files
-	emake -j1 DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/gle-graphics || die
-	dodoc README.txt
-
-	use doc && dodoc build/doc/gle-manual.pdf
-
-	if use emacs; then
-		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc}
-		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el
-	fi
-
-	if use vim-syntax ; then
-		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
-		cd contrib/editors/highlighting/vim || die
-		chmod 644 ftplugin/* indent/* syntax/* || die
-		insinto /usr/share/vim/vimfiles
-		doins -r ftplugin indent syntax
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 6324f7f5bd57..512c0aae0eff 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/sof-firmware/Manifest b/sys-firmware/sof-firmware/Manifest
index a69252abccbf..1bcd6f394cd7 100644
--- a/sys-firmware/sof-firmware/Manifest
+++ b/sys-firmware/sof-firmware/Manifest
@@ -1,7 +1,7 @@
-DIST sof-firmware-2.2.2.tar.gz 4116116 BLAKE2B e5722242e4b0130086ddb1b12d2adf29254bcae294f3ff49ac07dab3eab75e352a30346dd07c73ac51112b4c5234dc116de81251e01b146328cab673711f1f4c SHA512 6a3be7088f8a93a052563e040a588c600512d08d4b75ae5567db255e334997a6401d41863dcb416562eee07fef0bd2abe1d9d0403cd236ab007474f66271db50
 DIST sof-firmware-2.2.3.tar.gz 4358105 BLAKE2B 2b3bfd53b9c0207720068c0ac7639acaf653bb276c20f353396e1a01255839c34514c52640526dfa8f5cbc9229f75ba08363c40cf756b78f0b0c6b12a6e033c9 SHA512 c4e345d0932d1c607072feea41acf2f3a5b3694b0c468515a28889b6d0ba46775f91ef9edf91a321a3be056705dc8b4df9c836096c2e73063afcbc166ca10abc
 DIST sof-firmware-2.2.4.tar.gz 4367865 BLAKE2B cf2896095597ff9a33090307333289d87ea9024f70cd3fd3d1c86232a47ffd95972264754ea6a67c5f57bce33267bb93ab332cd2cd44c96a58c970a176d5fabb SHA512 f631bedbc5cceb0e3a668264c11f4e41f09f140ef909ac2557c4965a0b56deb00fa48ab06987fd2fd06eb97a35bc90342c5d7234d43390257bbd0942a70ce29a
-EBUILD sof-firmware-2.2.2.ebuild 898 BLAKE2B 074de783ce38f7f5dba413a40fbdfd46913dc6b1ed16cac2935f721d4a40d5e9313f47127f619d3c66bfafe6a14453ae2077c4f9e7c4005eae1b78488df0ef0e SHA512 dcaea87ffd52b5494c4600a5f7702b1069e7c2c7acb7efec65014f33501f0d8f4027516646b4c610962f019175be7ef7d2bf2c501001df0af9cecd88db8da577
+DIST sof-firmware-2.2.5.tar.gz 4381857 BLAKE2B 681ffbc16d983b795556b00881d59d2a0ba258f89482d6e136ddb61345718802d1b3f7fcc494091337f42f9377a8831d890e2c5de140f083e223f29cc5936742 SHA512 c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db
 EBUILD sof-firmware-2.2.3.ebuild 898 BLAKE2B 3fde21e996f0260ff505da9ff8eda756cb5fe4423e3e7cea97297dda5de1a216a7ec03afeb4023fdb63f70775ebee1cb650f6f42807fb88e979a216e267c2b2c SHA512 8c16acab856a90512b195263796611f98eb4c4c64ef09763a9862b37cd841a438f65ea30d22fbf630f9674d6a07c0ea89f5fdd26677d4d6a5ab93e160a9b1241
 EBUILD sof-firmware-2.2.4.ebuild 899 BLAKE2B 6d5d1d8805456d1e5dd4e2c49f46c44d6a3d6c96a831d58c4141cf77131baede042cf9dd915da181e6d61d54a8ac8c01b6106b593b1f5e3cb64195c66e4ee07d SHA512 682abb3ca57c3e3dc6db6cad59ff9b86f323207771a6302a634c2df34b161b53d1d6d1fa153767d0682432868253c242934387b06c6582ee1a32b106e82b2c26
+EBUILD sof-firmware-2.2.5.ebuild 899 BLAKE2B 6d5d1d8805456d1e5dd4e2c49f46c44d6a3d6c96a831d58c4141cf77131baede042cf9dd915da181e6d61d54a8ac8c01b6106b593b1f5e3cb64195c66e4ee07d SHA512 682abb3ca57c3e3dc6db6cad59ff9b86f323207771a6302a634c2df34b161b53d1d6d1fa153767d0682432868253c242934387b06c6582ee1a32b106e82b2c26
 MISC metadata.xml 304 BLAKE2B 66a80b69974755eb63ca7f97c3721f87f39f6cd93bdf269cd4ad8f4dd8ce39919ceb2d9ee7fa2963e42d6bee219296f64b79351ac82ef9b11283642fd13c120c SHA512 9cf2218b98365cee88eecba8ae3ff6a61ed724b030accc9f0168fcbf024898c1cd9745223874f80af795c8e7d18230d7d9c4c94cb57928b6c28f7323fbf50af3
diff --git a/sys-firmware/sof-firmware/sof-firmware-2.2.2.ebuild b/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
index 11f617551116..4bb0bf958007 100644
--- a/sys-firmware/sof-firmware/sof-firmware-2.2.2.ebuild
+++ b/sys-firmware/sof-firmware/sof-firmware-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}"/sof-bin-v${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 # Needed for sof-ctl
 RDEPEND="media-libs/alsa-lib"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9ba252b27de5..62f461e45502 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 916ec8d53708..1fdd9215c74c 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20220509.tar.xz 253717320 BLAKE2B 0181e209a05c3acbdcdc175868dca0ae2993effac0b265335f502a03d3a38cc4849366bb229ade87621426e99112f520f4d50444e438572c61cfc2c6d01ed6a6 SHA512 17d48222a0029d0540a7071b541653a42d66676c4dde88b7c148249450cfcb09087318cb4558ca7a0a7583f3bf0b00948d9383073e038c4f76bc4e807c757c2a
 DIST linux-firmware-20220610.tar.xz 252543088 BLAKE2B b3f627fe150f76c9a1c7b70bf691587554808275debd56e9d36fd0eff63b7ab2351ba03dd298066b03db7f2e590d7f130677e158ade587fbfb59a9efd8f83c0c SHA512 76176af2bf1e83d91c88289623364bc5d3e45d96c8586bd5c064535ee245d133283d2176d142492139cfbd41ca6ad195522c662d923b6cc76556c8509638ad0d
 DIST linux-firmware-20220708.tar.xz 242130176 BLAKE2B 7dce1bf1e13c1c59dd0de8485301cc011e8d73ee55d5dfcf9554ebe13c53870d3d6c2b7b8a79984ea0ea0eb8683bdd589c49e7824081c985bb951753431ee35b SHA512 cc3454ba9a26fac8ce87a08f5fef74a586e81ba3225bac53c702749fb6606cea829cea51d6cf55e0cb2fcfb28b2350d60998fe7782cba00d6eb5b26204f57e37
 DIST linux-firmware-20220815.tar.xz 253238428 BLAKE2B 1de6998f1a993aa035e3eff76abc6cca49445ccff917b2a4d1e48b61087ec5bb15ff1efe7427735f766ae6a169d1c1ee2cede08d4c940362b73c37cae01aae44 SHA512 c8d4a7049fbb9d2b6e52272bded1f88cc49a27ac8a0f8cff57db5bd9f15e549724e140638667b1e60159f523039941c47dfeaa372cd5bcb206f35e9dee38ea73
@@ -10,7 +9,6 @@ DIST linux-firmware-20230117.tar.xz 301424540 BLAKE2B 84a1d1f9d745434f6497cb4e82
 DIST linux-firmware-20230210.tar.xz 287648576 BLAKE2B d6ccbaa060df7c7752e93014baead7158d99bff05476581c954f6e97d9d97741d3b1a48fcba556c5befa6857ea9151beffbd1e0df6fc5e2cec850d11d411a5e6 SHA512 6356e1b6ee79e2108c994c91b922eb07b8eb69024b2d9fcea0ee6fe4094849465e292147d2e168930eb90f2f054727ab1f343cb76d5b604739262fd1f57e9ee6
 DIST linux-firmware-20230310.tar.xz 271812128 BLAKE2B 5e2b9db035e48a3da6e07401e0b7687b79b8206a3c54ab35aed39de83eea0ccc7b7a94c3b3b0d9cd418a9bffbc30decb7e6cd68984ecda9483ff82ca326c6865 SHA512 817e99cc4a5fab36314b3f7449796721d524bc1c0f95cf8e78ce65dbb548a75d7ff9d5bee5370be315da73c26c9e6f93dd421b3cda4b2938ff4f2b4a2a629f3e
 DIST linux-firmware-20230404.tar.xz 273105092 BLAKE2B 3bf6c4d5e501362613bdcb01c416a4ed8f818c48bc5875040aec05b63b570d156200ed85c7206d2075b9b0998aa4a358c0bcd5fa3abd3efcee145492b602db52 SHA512 815ee4c72396d9dcebd1e8a66cd63a523e3dcf623a06cb6d5d4df63a0830532c66f5c4564dd3c258ebe5072830a103800b7159d39d7a68cbb40d76abed399f9c
-EBUILD linux-firmware-20220509.ebuild 9779 BLAKE2B 680b376ab7bf5e5fdb7acb7bd349f4420deb5135a34437c2fdad8d3afca2cc826a741dda681eca4de3a61212b322f0ce8d3a1b9120bf5ea860a92ade87bdf738 SHA512 5c0d79ede039b22870c46a9e1e1f721d11f7c42b03b4c731505a3173b23fa0dcbc68b494c5306a3d2465b9e77579171dd21963b2132e01929da82434273721da
 EBUILD linux-firmware-20220610.ebuild 9779 BLAKE2B 680b376ab7bf5e5fdb7acb7bd349f4420deb5135a34437c2fdad8d3afca2cc826a741dda681eca4de3a61212b322f0ce8d3a1b9120bf5ea860a92ade87bdf738 SHA512 5c0d79ede039b22870c46a9e1e1f721d11f7c42b03b4c731505a3173b23fa0dcbc68b494c5306a3d2465b9e77579171dd21963b2132e01929da82434273721da
 EBUILD linux-firmware-20220708.ebuild 9714 BLAKE2B 188efe09b69f66b94144dda5d092031eb100ab6d5c8cd90bc05d502f9be7b3be712b0aaded102e55b1b06e0c90b257d54b405f8edf89b129bda4a847f14b1ec7 SHA512 90cd916aa32ad9c1e53ddc782faf19a42bb16a818453a889e48326f8eff43e5fda624db78bb0ebcdb775ef016353d52ce5928ec5430b81f993a04601160b8acf
 EBUILD linux-firmware-20220815.ebuild 9714 BLAKE2B 188efe09b69f66b94144dda5d092031eb100ab6d5c8cd90bc05d502f9be7b3be712b0aaded102e55b1b06e0c90b257d54b405f8edf89b129bda4a847f14b1ec7 SHA512 90cd916aa32ad9c1e53ddc782faf19a42bb16a818453a889e48326f8eff43e5fda624db78bb0ebcdb775ef016353d52ce5928ec5430b81f993a04601160b8acf
diff --git a/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild b/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
deleted file mode 100644
index 261b658f7b55..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20220509.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-# In case this is a real snapshot, fill in commit below.
-# For normal, tagged releases, leave blank
-MY_COMMIT=""
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	if [[ -n "${MY_COMMIT}" ]]; then
-		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${MY_COMMIT}"
-	else
-		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
-	fi
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
-	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
-	unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-REQUIRED_USE="initramfs? ( redistributable )"
-
-RESTRICT="binchecks strip test
-	unknown-license? ( bindist )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
-		redistributable? (
-			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-			!sys-block/qla-fc-firmware
-			!sys-firmware/iwl1000-ucode
-			!sys-firmware/iwl6005-ucode
-			!sys-firmware/iwl6030-ucode
-			!sys-firmware/iwl3160-ucode
-			!sys-firmware/iwl7260-ucode
-			!sys-firmware/iwl3160-7260-bt-ucode
-			!sys-firmware/raspberrypi-wifi-ucode
-		)
-		unknown-license? (
-			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-			!sys-firmware/alsa-firmware[alsa_cards_sb16]
-			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		)
-	)"
-
-QA_PREBUILT="*"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
-			mv ${PN}-*/ ${P} || die
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	find . -type f -not -perm 0644 -print0 \
-		| xargs --null --no-run-if-empty chmod 0644 \
-		|| die
-
-	chmod +x copy-firmware.sh || die
-
-	if use initramfs; then
-		if [[ -d "${S}/amd-ucode" ]]; then
-			local UCODETMP="${T}/ucode_tmp"
-			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
-			mkdir -p "${UCODEDIR}" || die
-			echo 1 > "${UCODETMP}/early_cpio"
-
-			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
-			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
-			if [[ ! -s "${amd_ucode_file}" ]]; then
-				die "Sanity check failed: '${amd_ucode_file}' is empty!"
-			fi
-
-			pushd "${UCODETMP}" &>/dev/null || die
-			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
-			popd &>/dev/null || die
-			if [[ ! -s "${S}/amd-uc.img" ]]; then
-				die "Failed to create '${S}/amd-uc.img'!"
-			fi
-		else
-			# If this will ever happen something has changed which
-			# must be reviewed
-			die "'${S}/amd-ucode' not found!"
-		fi
-	fi
-
-	# whitelist of misc files
-	local misc_files=(
-		copy-firmware.sh
-		WHENCE
-		README
-	)
-
-	# whitelist of images with a free software license
-	local free_software=(
-		# keyspan_pda (GPL-2+)
-		keyspan_pda/keyspan_pda.fw
-		keyspan_pda/xircom_pgs.fw
-		# dsp56k (GPL-2+)
-		dsp56k/bootstrap.bin
-		# ath9k_htc (BSD GPL-2+ MIT)
-		ath9k_htc/htc_7010-1.4.0.fw
-		ath9k_htc/htc_9271-1.4.0.fw
-		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
-		cis/LA-PCM.cis
-		cis/PCMLM28.cis
-		cis/DP83903.cis
-		cis/NE2K.cis
-		cis/tamarack.cis
-		cis/PE-200.cis
-		cis/PE520.cis
-		cis/3CXEM556.cis
-		cis/3CCFEM556.cis
-		cis/MT5634ZLX.cis
-		cis/RS-COM-2P.cis
-		cis/COMpad2.cis
-		cis/COMpad4.cis
-		# serial_cs (GPL-3)
-		cis/SW_555_SER.cis
-		cis/SW_7xx_SER.cis
-		cis/SW_8xx_SER.cis
-		# dvb-ttpci (GPL-2+)
-		av7110/bootcode.bin
-		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
-		usbdux_firmware.bin
-		usbduxfast_firmware.bin
-		usbduxsigma_firmware.bin
-		# brcmfmac (GPL-2+)
-		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-		brcm/brcmfmac43340-sdio.meegopad-t08.txt
-		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
-		brcm/brcmfmac43430-sdio.AP6212.txt
-		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
-		brcm/brcmfmac43430-sdio.MUR1DX.txt
-		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
-		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-		# isci (GPL-2)
-		isci/isci_firmware.bin
-		# carl9170 (GPL-2+)
-		carl9170-1.fw
-		# atusb (GPL-2+)
-		atusb/atusb-0.2.dfu
-		atusb/atusb-0.3.dfu
-		atusb/rzusb-0.3.bin
-		# mlxsw_spectrum (dual BSD/GPL-2)
-		mellanox/mlxsw_spectrum-13.1420.122.mfa2
-		mellanox/mlxsw_spectrum-13.1530.152.mfa2
-		mellanox/mlxsw_spectrum-13.1620.192.mfa2
-		mellanox/mlxsw_spectrum-13.1702.6.mfa2
-		mellanox/mlxsw_spectrum-13.1703.4.mfa2
-		mellanox/mlxsw_spectrum-13.1910.622.mfa2
-		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-	)
-
-	# blacklist of images with unknown license
-	local unknown_license=(
-		atmsar11.fw
-		korg/k1212.dsp
-		ess/maestro3_assp_kernel.fw
-		ess/maestro3_assp_minisrc.fw
-		yamaha/ds1_ctrl.fw
-		yamaha/ds1_dsp.fw
-		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
-		ttusb-budget/dspbootcode.bin
-		emi62/bitstream.fw
-		emi62/loader.fw
-		emi62/midi.fw
-		emi62/spdif.fw
-		ti_3410.fw
-		ti_5052.fw
-		mts_mt9234mu.fw
-		mts_mt9234zba.fw
-		whiteheat.fw
-		whiteheat_loader.fw
-		intelliport2.bin
-		cpia2/stv0672_vp4.bin
-		vicam/firmware.fw
-		edgeport/boot.fw
-		edgeport/boot2.fw
-		edgeport/down.fw
-		edgeport/down2.fw
-		edgeport/down3.bin
-		sb16/mulaw_main.csp
-		sb16/alaw_main.csp
-		sb16/ima_adpcm_init.csp
-		sb16/ima_adpcm_playback.csp
-		sb16/ima_adpcm_capture.csp
-		sun/cassini.bin
-		acenic/tg1.bin
-		acenic/tg2.bin
-		adaptec/starfire_rx.bin
-		adaptec/starfire_tx.bin
-		yam/1200.bin
-		yam/9600.bin
-		3com/3C359.bin
-		ositech/Xilinx7OD.bin
-		qlogic/isp1000.bin
-		myricom/lanai.bin
-		yamaha/yss225_registers.bin
-		lgs8g75.fw
-	)
-
-	if use !unknown-license; then
-		einfo "Removing files with unknown license ..."
-		rm -v "${unknown_license[@]}" || die
-	fi
-
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-	./copy-firmware.sh -v "${ED}/lib/firmware" || die
-
-	pushd "${ED}/lib/firmware" &>/dev/null || die
-
-	# especially use !redistributable will cause some broken symlinks
-	einfo "Removing broken symlinks ..."
-	find * -xtype l -print -delete || die
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			local files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-
-			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
-			find ! -type d -printf "%P\n" \
-				| grep -Fvx -f "${files_to_keep}" \
-				| xargs -d '\n' --no-run-if-empty rm -v
-
-			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
-				die "Find failed to print installed files"
-			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
-				# grep returns exit status 1 if no lines were selected
-				# which is the case when we want to keep all files
-				die "Grep failed to select files to keep"
-			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
-				die "Failed to remove files not listed in config"
-			fi
-		fi
-	fi
-
-	# remove empty directories, bug #396073
-	find -type d -empty -delete || die
-
-	# sanity check
-	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
-		eerror "No files to install. Check your USE flag settings"
-		eerror "and the list of files in your saved configuration."
-		die "Refusing to install an empty package"
-	fi
-
-	# create config file
-	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
-	find * ! -type d >> "${S}"/${PN}.conf || die
-	save_config "${S}"/${PN}.conf
-
-	popd &>/dev/null || die
-
-	if use initramfs ; then
-		insinto /boot
-		doins "${S}"/amd-uc.img
-	fi
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
-
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 69ec2e27df4c..d1b1f4f63847 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/element/Manifest b/www-apps/element/Manifest
index e9058e017e8a..ea9525bc14b3 100644
--- a/www-apps/element/Manifest
+++ b/www-apps/element/Manifest
@@ -1,5 +1,7 @@
 DIST element-v1.11.24.tar.gz 21199963 BLAKE2B 277de83ae4a2caabec1593ff9e87bc83e767103653ad49e7cc9e653962269faa72f6abeeac545765edd06ae5ce46290f503507feac7bc35de2cb58b8a47920f2 SHA512 b46617ad634fed985f8067d1f8cef3feb873e2fe9626cd9320693326a698b0e8703ee7c73d04dde534bac00c4b94516dcdd5f6fad63b4474144fa1a8344b6a6b
 DIST element-v1.11.29.tar.gz 21463235 BLAKE2B 3b659a497a877ff2a3d94bf810d98f1a7712d4d148a5a3b32e25a3242ce715afe46858106957832b4dd81da8f0730cd8f72c1939a130535ef9d2aeb586c60917 SHA512 c9018d547ea3c801a847cc4e5aa3416163d246fc0f509297b98b694a42e8f15f4b47c75dcc83351a586489a34c30bdc5b9dd895880ff1d79000aca6e37ebe0d9
+DIST element-v1.11.31.tar.gz 21812209 BLAKE2B 4ad1984137e8f18fe9c50ba1ed880674143e4405dd91e48b27b658f7da27a95556602eaa6c9119d0ee325cf53829b337cf4b3608d85adcfab753dcc116bf6a62 SHA512 8b4081192b61152467bb1f55a48746b7ab038046558fc5c1976bec17e0e93c53d9f3f47f13bef96a7e5e9106cff2c410f1d8f8a76121414ba9b5b932122858fc
 EBUILD element-1.11.24.ebuild 740 BLAKE2B 97a68bea01e36b128e359c33d5744feb477d8e23925368ce8ee19d5ccc0ab090a6e755fdca3b827019afd92efd1f5437690deb8c522272b1534db0954e13931f SHA512 35892fa57e0d6998eb3457c55a6aae033bb0b8d57d8be8f7f7e13c062bcf4843332754e817b2ad4d99ebeba001e7c0dd9af26af0c3bdf9f3852b351f58120624
 EBUILD element-1.11.29.ebuild 740 BLAKE2B 97a68bea01e36b128e359c33d5744feb477d8e23925368ce8ee19d5ccc0ab090a6e755fdca3b827019afd92efd1f5437690deb8c522272b1534db0954e13931f SHA512 35892fa57e0d6998eb3457c55a6aae033bb0b8d57d8be8f7f7e13c062bcf4843332754e817b2ad4d99ebeba001e7c0dd9af26af0c3bdf9f3852b351f58120624
+EBUILD element-1.11.31.ebuild 740 BLAKE2B 97a68bea01e36b128e359c33d5744feb477d8e23925368ce8ee19d5ccc0ab090a6e755fdca3b827019afd92efd1f5437690deb8c522272b1534db0954e13931f SHA512 35892fa57e0d6998eb3457c55a6aae033bb0b8d57d8be8f7f7e13c062bcf4843332754e817b2ad4d99ebeba001e7c0dd9af26af0c3bdf9f3852b351f58120624
 MISC metadata.xml 339 BLAKE2B 3dec6820a014466f1aeef112cdbb8a773a19acb6aa4834e1feb45519f0f3c898ad593d796f84fdc450dcbbb0546615fa0fc4b37d0fd9f28cfea68c57a87e1573 SHA512 6d9d4e8f95e054b651545a18c5022f6cd2060ac62b15b6af44d52e78047031c185f5990e0eeaa2970fba426bc55ed001874b796cfdba268b3f542215415a1d43
diff --git a/www-apps/element/element-1.11.31.ebuild b/www-apps/element/element-1.11.31.ebuild
new file mode 100644
index 000000000000..5607e225bffa
--- /dev/null
+++ b/www-apps/element/element-1.11.31.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="A glossy Matrix collaboration client for the web"
+HOMEPAGE="https://element.io/"
+SRC_URI="https://github.com/vector-im/element-web/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+need_httpd
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/home
+	dodir "${MY_HTDOCSDIR}"/sites
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/home
+	webapp_serverowned "${MY_HTDOCSDIR}"/sites
+	#webapp_configfile "${MY_HTDOCSDIR}"/config.json
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 03f0dfb0ece8..9984d5e4983f 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,12 +1,12 @@
 AUX php-argon2-en.txt 416 BLAKE2B 9940a3e218d1db382790f4754352594c9098eccce7426729e75471f017e15bb45b50cc885609e54817077e36d9feb4484bcff5b40c4f669ad80d4d5a643da8bc SHA512 076bbbfb9305a2608b60fb7f9802a5a455c5d049d39c8f209eadac1a306ba2015d11a30b4544d8cdf43025077a3c3087f3e9922cd9b530a08c089a7818590115
-DIST nextcloud-24.0.10.tar.bz2 124303994 BLAKE2B 17d83a5dc5fd54ce5cdf84678f23e02ec49177d717d854977457cefacdfc7c58ab98bf7a31fc48f69c8b8ec06bf978e0de1bf03e45620369a39d6bc9b269c1df SHA512 519ad653a64ee329f769b6a047ef6826984846af3a6dc3e5666a4101c997af5e8e50ebc5678623d5bdb98b55f0a6bdb1c82ed410ce4671dca41e313f36de3309
-DIST nextcloud-24.0.11.tar.bz2 124651413 BLAKE2B 3ee7f5da74e15d21b3384537688af7b3f40f2ea1be22b5910150511e87b6780a5ec450db256ae21d55e1ba0ef64d78aaa5f28aae3bc01ea0585934328e631577 SHA512 20c5f65bb72ca5b144702b522dc9bbac94a839801c392a25ef8c2765800909678b6bb85a1c088fccc92d035a0316a9e038358878d8e00db63b09fc23907cfbef
 DIST nextcloud-25.0.4.tar.bz2 145687281 BLAKE2B b349cea558ef2b1925da19713b76553076d57ee9e2fd07123796c0f329e139ccfb66c3e113ddb4bcdb7841d5e61eb1237748fd1c38216f7ae43c006e87730deb SHA512 0a9a6a2cc26951ede77509926fd6192668d140559daaa49611e8f9d592ccec39f22c7289d2d55794885afc7665bfb6f5eae43a0e6d160954b21c3e236da944e5
 DIST nextcloud-25.0.5.tar.bz2 145918261 BLAKE2B a9f9f40f36b5024f7a1a1f9ea6e2488c790cc761f26cf137975a31fdbd711fada90bc1fc621094987467de59d8bb434dedabee09400ee0253d61953a8d84ba7e SHA512 03563ff552ab2ef195070079ef54a24d8f04b30b09ffb2f870eeb64fab3575c1e8535d98043ab9bd2e0a54fc515cf64ab3d2f9e14e71df2e482f104b0fcf0231
+DIST nextcloud-25.0.6.tar.bz2 146051131 BLAKE2B b4554537715eaa3b83c18ca752e81e3301ac380ba8260a1ca8c72d4b5b3dfafd54580bb36e39024f5abc748d0acd1950b35b7e524497457532525871a50f8b29 SHA512 8ae5728786283ee6bd25670225b1cd0653c88388ff11518119cc416ee295dc0e02c44b1be6e071fd72803b1bc4dd2c4b942d8b9e79407a495e578b4880c217ea
 DIST nextcloud-26.0.0.tar.bz2 149346219 BLAKE2B 0e01dc1b364a27d0bbb58f91c831f099679c9d78dd21bafd0e50867fd3ccc7f2b50158bc393b7e6b87e51805d653007148e2aa06f26c0c12942e5cbe840beafe SHA512 ad589d2e128fd73e9282e1f41d5189dc3216270e546524e8feaefa9013202e806047cc304ef77a8954eac16b010b3d65bc99ce8547256c1df6e90b69aa2f232a
-EBUILD nextcloud-24.0.10.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
-EBUILD nextcloud-24.0.11.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
+DIST nextcloud-26.0.1.tar.bz2 150951206 BLAKE2B 4d5021353560626fda6cd71f073c4a219e7a4062738edbca5f8a69e138ba7f970588e88f3975c9bb22e7e7a3bb26727972729f569ed7a66cecdc86cccc0fb6cb SHA512 058ea33d4fbbf7e8c54dfda71989e95893dc24e0c538d7dbc502f3cd36247d4cfa7e5d32d5d437532229aee8d73fe7e643672835d7207aa3d7990ff455a3372f
 EBUILD nextcloud-25.0.4.ebuild 1086 BLAKE2B aa1217de7ff106e80187b01a0c04a3434e77bd03792fac39d529b11f5a9d8ec0a3324fcade67106a8128ea544b1e6e3d9a903ff0d2c22c8c4cf5a28c9e953392 SHA512 060b0be540bfa70241c70262c516f168188f7e361abd87deb91b70e5667cf3e8e48a5eb9796e303731585b596d778a3a2a0cb8be4fc3d61efe720d8d81c0bb9d
 EBUILD nextcloud-25.0.5.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
+EBUILD nextcloud-25.0.6.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
 EBUILD nextcloud-26.0.0.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
+EBUILD nextcloud-26.0.1.ebuild 1088 BLAKE2B 7bc47a38db0ac249525399ac71e0dc121f7e917a11fba177422f48e9254b2446fc5c4688deedb14e11c2420af8d42ea5f17a1c91f124439d2a06d88d626cd66e SHA512 7ce826cfc3fb3f33b64a6a555ce2dac222acc4430cac84585bc98a4c783ec965f8c7252d1a1192b7ade62bbd70cf87f7e60e49224abcbd87a6d334c58d2543e6
 MISC metadata.xml 533 BLAKE2B bbbb5b440e2d38d6882451584a997c4b21b2afcb8e8da8c8dd9fcaf00fdae0a3643413d3619401faa3875f93cdbd1a090db308b72d315711e859405757d4df7f SHA512 a18ee96f8aae2ed8c66faa777a303bb45eb27c49c25ff56e5f01ef4a4f9df03ef0581ad92084e37683ece26b1c25c1a9ec843d1219964954d19c2bcfbe3f4a0a
diff --git a/www-apps/nextcloud/nextcloud-24.0.10.ebuild b/www-apps/nextcloud/nextcloud-25.0.6.ebuild
index e9db891d0021..e9db891d0021 100644
--- a/www-apps/nextcloud/nextcloud-24.0.10.ebuild
+++ b/www-apps/nextcloud/nextcloud-25.0.6.ebuild
diff --git a/www-apps/nextcloud/nextcloud-24.0.11.ebuild b/www-apps/nextcloud/nextcloud-26.0.1.ebuild
index e9db891d0021..e9db891d0021 100644
--- a/www-apps/nextcloud/nextcloud-24.0.11.ebuild
+++ b/www-apps/nextcloud/nextcloud-26.0.1.ebuild
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 23f648bfb286..25d10111e648 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +1,7 @@
 DIST owncloud-10.10.0.tar.bz2 65066915 BLAKE2B 014320d33d18d07390ceeb773e8513d1135038974cdfab6cf688771237cbc924f00a25d47fe1e77b39d84718f21fb5e5d5cb202e44b8e7ce77a5dc4393db5023 SHA512 aedd71696ad85b03ecbc26dd064d07b7e3f1ddbeddcec4090674cebf4debc40c555f2b232615e3c089f5525c04e0dd8cf113c7284c99ef7da2cef7193f20fee7
 DIST owncloud-10.11.0.tar.bz2 62653820 BLAKE2B 8185be40bab9aaff5307b6cb68b716c26a97da578ba9c038fce1b387ae00e4109343ac93d2aab33ef40c8d1cd161b7583551f8d85cd93cd96277695b646653a2 SHA512 f707e5cbbf19c43fc225987763be29b1d967a76ae14bf997d69549a1ceff31fe1ed9d9d48f93be0b8a9fbbd23d16208b260d57bfcfaac79b106837923d29f835
+DIST owncloud-10.12.1.tar.bz2 58399054 BLAKE2B 78de646102ae40967395c3727cfa47e1bfb16dd1967fb52a2d5df45bc600e4cfc24fba5d3cd19e407c1b60b717358c6db04510095748016715ecd8a83ea7c083 SHA512 4f5a68b335ca2d5bd673dc4469d3f9b987927e33a6d39542e7551556a6cfb739e7ee03e8cd78d468843f910e046b0285d11922415884c90dbad938fa86db1b2b
 EBUILD owncloud-10.10.0.ebuild 1259 BLAKE2B a1be11e3faf8c89c26594f7ddcf28471c9cba039f5c575c0e602d617e5c88aaa58c8db26f7a1e2d8f04fbd20c6b1be54872edae5c77dcd16376ed1844649d0a6 SHA512 8b41a8ab7cebf790b0c2781d0bf1168f5d937c52a8588cd929d7da1cb3858b3431307acfd203771b82a850b17f637adc45a02a50bdf36788d1275061f42c5b6e
 EBUILD owncloud-10.11.0.ebuild 1259 BLAKE2B a1be11e3faf8c89c26594f7ddcf28471c9cba039f5c575c0e602d617e5c88aaa58c8db26f7a1e2d8f04fbd20c6b1be54872edae5c77dcd16376ed1844649d0a6 SHA512 8b41a8ab7cebf790b0c2781d0bf1168f5d937c52a8588cd929d7da1cb3858b3431307acfd203771b82a850b17f637adc45a02a50bdf36788d1275061f42c5b6e
+EBUILD owncloud-10.12.1.ebuild 1259 BLAKE2B 82da7b6bc5d373c5af4f959ffef7b84e3fa6f5b82165b8d6957b477f5b5b0d7c5f17e853c29a7e27f575cf249e101fb78635d193bcfde98b31c05491c27ae59f SHA512 ebc4ae4b4afa350972c367f1af5f1120a22ad6ca3e2cc66a939b7b7a9ffb18c8fcdd18e16549dfcb1f772e03b153c27d258c12120e7e1fb5f7ecf6e613fb3f8a
 MISC metadata.xml 363 BLAKE2B f3e41cd23ac1e4e6d8cddfc0291f626fe7e28379dc886a9bf9ea9ae9bfd94b646ecd6dcc7af9d808bd579f69728279bad991bd940777ab2cae199b805729daad SHA512 0e0200aa0ae268650f684d22f40701d3259cbdcca639042edd9fd875bfc218b217310238f5b9b97658917023bdf1fa5ed7aab82f068b4a03752b718138ff79ed
diff --git a/www-apps/owncloud/owncloud-10.12.1.ebuild b/www-apps/owncloud/owncloud-10.12.1.ebuild
new file mode 100644
index 000000000000..2c71617116f0
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.12.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.com/server/stable/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 28987e97e186..cb1d8a12fc8f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest
index 968f3038a1de..15b705258d34 100644
--- a/x11-misc/copyq/Manifest
+++ b/x11-misc/copyq/Manifest
@@ -1,7 +1,5 @@
-DIST copyq-5.0.0.tar.gz 3019807 BLAKE2B d39c02867ed4a23eeeec7283f0cbf02a77a3c3fc3ece0a7323d67de9d2b8f03749318d066c23221ccd393923217c7cf357657bdf70802087edae7f4128a63529 SHA512 b6ff28bd7529bf371c7f9d10372eeafd5f291fd1f6bbed5416938973db43e43f0113a8f6ba4619840a7edd95d26ccb9369f8a58d30b740944d3f8510482b1405
 DIST copyq-6.4.0.tar.gz 3316278 BLAKE2B 348fdc23a6d0d53ddcc8e2c32b194cfbf6c4d4d2374b972cb81d945e284c42d1e8f6b9ed30e657e43e69ed0f35661adc7875392b5daf653ce895d76afed7c09c SHA512 a97b4ac541ff73129a6283266fb8857d89d571d042829de5793b94e6423a2978f632b22728ca663bccd540bb90fed51c755b432d1d2545f75c227ea2cb0d9581
 DIST copyq-7.0.0.tar.gz 3323354 BLAKE2B 3c71bf94ed97d0564f89cb0b9927024df21520cf9eb758ec8c40e8156d9796b3c6df5518b9ad223c12489fe7aca3a067f772719a3a757f9a92e9ec18fe79e38c SHA512 f0b84ddef6791e229c625dbdefab2d3aad5be10d68745addb64d6e2b1546e033f1f95fb1a1218f9fdd19b5fcdddf2d840b2480ad54e0f59a7d5741781b3a43c4
-EBUILD copyq-5.0.0.ebuild 1116 BLAKE2B 9b3ec608c4d55298f5c652fb178a6ea8e490e340be19bd54b5b2d159c2ef4885463b0f920b56b80c51d33d221d42d55c7996875c33083088c6bdf381fe82a6a4 SHA512 5d6c7ca5e4763ecb46c815d5306e7b9c2b8346c330c9f6d2441dd058c3661b77d697f4e09d5773669271a2926b4aad741793ef365a7b7654fb898af273d097b3
 EBUILD copyq-6.4.0.ebuild 2254 BLAKE2B 74ce469f1025c2b9f229d7655a3f40fc72522f538e6240e48a8a2ad4b034affad306e949b17b9f670df926fd068a54e599eb61e340b6c7597a8d1494ac2c943f SHA512 f89abe745111e9d8cef11a563ed73f8618017675ead625e3246d76294ee7d95238df7fb8b62125c24355dab783565006a399df9b9d9262413914c18387a8e502
 EBUILD copyq-7.0.0.ebuild 1941 BLAKE2B e33dfc9b7b634f6aafe066a8d6c9fb158701c338a0dfb5f2fdcf13c98d0181048ec707a61c219bef0ed97cd4dcd5a5ce4888a92cb3b9554d380034f1cd8727e7 SHA512 f68784d22a6ac79582494703a0ef89ccbeb5c4af697d90d012cf7f383d850a2e60cdbd66cf8e93f0152a6e4b08dbff555149916ebeb2a7d594cf53708cd38fd7
 MISC metadata.xml 243 BLAKE2B c814627bd719a7e626871bf03cb2a0d2a523bff91989d9e77ef27f5c234095eaf737edf0a9e795fbe5f2317884d6d8e735e19742776ef023b37c1364be1387c7 SHA512 802294fe73a224455ea8ea3ad5ed320c3f8cc803ba90cf6805a9a6bfafb627dee7334563f901d5c01ac37d2134d88aba1075defd1ca7420022a4cee996af778d
diff --git a/x11-misc/copyq/copyq-5.0.0.ebuild b/x11-misc/copyq/copyq-5.0.0.ebuild
deleted file mode 100644
index a8356570fecc..000000000000
--- a/x11-misc/copyq/copyq-5.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Clipboard manager with advanced features"
-HOMEPAGE="https://github.com/hluk/CopyQ"
-SRC_URI="https://github.com/hluk/CopyQ/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/CopyQ-${PV}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/wayland
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwayland:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/knotifications:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DPLUGIN_INSTALL_PREFIX="/usr/$(get_libdir)/${PN}/plugins"
-		-DWITH_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 02f5a33c7449..c8e29d9326d7 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index e51751e2b142..a8f3e080e9b6 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,3 +1,5 @@
 DIST QGnomePlatform-0.9.0.tar.gz 43828 BLAKE2B aa4d1d9269c444d95e7d25e0e0206a63adf0a1be8658624b61d5e5fe55d3714e38a66ecbb6ea19ebf0cc9ee1ed4fb5cf4f29a84e7052c1c2475deca395794cd3 SHA512 7671b0659959ede79e47a821481a14ed861418f364d3d0b48789b1edfcf3b84f2aa658e3afce95730a841fdb018ebad38474a83268bd43b1ccfb653ef7e314aa
+DIST QGnomePlatform-0.9.1.tar.gz 46387 BLAKE2B b62e6c6ca70e7e5a1a611d0a4af022aae0cf4096db51e00b2b45cf6ea655b703cd936336233c71038b82708ec79a202f436f5a29680ada6b4026958604c83670 SHA512 1b8f5d3241bbaa830858dc256285f91023a6e9f664c9920ebfdaf8bdc759e3c958a22bc52eb3559a86d96007118b8ce5efa900167feb491a60232b365c00784c
 EBUILD QGnomePlatform-0.9.0-r1.ebuild 814 BLAKE2B 3f39fb15f71f9d94719884e25f0028c2b1fde9beb64c5e4c06c5f8e751a7a4e146be20a33adc19ebac4cade61e1381dbe919ca60366e3c767a59ea91bb439055 SHA512 9c6dfbc8d0a1bf8d9087f77c2437160c1946e0708540eff808acc433f6c4081124826e8a0b94bb7d60dd4598c8c210aa42e17e66193bb13231f0078c12870b28
+EBUILD QGnomePlatform-0.9.1.ebuild 853 BLAKE2B bcf1a44f9833f7c97185b631d496d78f7f3dbbc225041c33b3216a10fb72e04b1e424204094da421a45690f8a55f4a5705103bdc673af90e5fff0666c7655b03 SHA512 d86385b91efcd7a79260c9efda07f252f72dd3591f88c10c413dbe72db1732c49ffec91e7ac64ca5f29c1745415ffbc23150d5902456272889069e1f9e48ae48
 MISC metadata.xml 305 BLAKE2B f67fe263c76d1afef25f949b60da91bece890f786e1123e3481addad7b90e56bb7371c56d44d7e619eac9bbedebce1ae934d3319903b403aed7d9c29eb915131 SHA512 cfd7d208224234fb616d260b4cbdf04bda0161a0c36746aea12c3ceca16230543429195b93465c5b44c7aac95f89da4e9175c70f70112cde27eeac0af040b267
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.9.1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.1.ebuild
new file mode 100644
index 000000000000..73a9b14424af
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
+HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
+SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="wayland"
+
+RDEPEND="
+	dev-qt/qtdbus:5=
+	>=dev-qt/qtquickcontrols2-5.15.2:5=
+	>=dev-qt/qtwidgets-5.15.2:5=
+	wayland? ( dev-qt/qtwayland:5= )
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/xdg-desktop-portal
+	x11-libs/gtk+:3
+	>=x11-themes/adwaita-qt-1.4.2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT6=false
+		-DDISABLE_DECORATION_SUPPORT="$(usex wayland false true)"
+	)
+	cmake_src_configure
+}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 4ff3566e584b..0e144ee069da 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index bee4d5ff900f..a7fd89422ed3 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -3,6 +3,6 @@ AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a5
 AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
-EBUILD xpra-4.3.4.ebuild 5322 BLAKE2B f658b1301adcd6dec129281d1726d462e8a67293a9456d4bf1a87ebf94474db0ae228805e1181e9aecbc73c2e7dbdf2b0935ced91b89db9bc93913b3f8967532 SHA512 98486d33cc43b0bffa9ad52ea71653b92b4b405e91f2ebfd4db7854dace0e7bec41cd1d8503569a35c377def618fedcee78737cfde51d2b780e094ffc8be9756
-EBUILD xpra-9999.ebuild 5244 BLAKE2B 6a034de431da942de78d170fecfb84c492c35b86684ba5f2d171dd83002c600791fa559ed231ef82d7c39d5b90fb2835a4bcc7a9b9f8d4176ae7e893937f5b9e SHA512 6ff2e13ba7a414cf2b95a43fd1701162c77549b51dcebc406eb91a85b3e8ebce4a028f95f6b96d35521bab8b4027375a204db82bba5925369b9f747d1de5cf77
+EBUILD xpra-4.3.4-r1.ebuild 5308 BLAKE2B 2857a1824784a46fc81f61424aeeb0677e0c878b27eddd39f7f3d90eccd271cb357b7b9293a20f70e40052d4680b7acf79614542adf8a1bb721274b1b1618d0d SHA512 071304877dc8380e273c41105c783e5c740e94c73f91803c5eaf025739ad442d68ed3c616278640a51fd4240825fb123f467ea5b484febf5c9a6f934267583de
+EBUILD xpra-9999.ebuild 5230 BLAKE2B 8d1e6e8517427347248db164f4115ff30631ffcc97034ebe849b3a1e32fc30c8c0bf583808e814bf2ea67e4f9259c86741be9800cc4b06042d040f17cb7ea5c5 SHA512 3b546176fea9d1853422c2ca38f182f423650f0972a2a9a73ee06a5942cf573ca6064ef842e0388e1203cc06563e14db3179d74f2596eeda70743abf60973eaa
 MISC metadata.xml 1292 BLAKE2B 748b4713831cc4f2d6bbfb4f9c4d073b654772a64cbb3e0d5c52b9afcaaf9f1355d6ab7ab38f72a27cf7290f124e3d458320ad07847f9720568a60603b2abe4a SHA512 ecd2f89e7ae720dd11f3a36ebf90447ec2f4e326a5621618b7f4bf68189771823edc09fedcf197fe997af1aba48b5eaea62ac98d6fedf8bb6dac404da3aef85d
diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
index 3583260ace2a..8afbbadd6496 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
@@ -66,7 +66,7 @@ DEPEND="
 	x11-libs/libxkbfile
 	brotli? ( app-arch/brotli )
 	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
 	jpeg? ( media-libs/libjpeg-turbo )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -159,7 +159,7 @@ python_configure_all() {
 		$(use_with ffmpeg dec_avcodec2)
 		$(use_with ffmpeg enc_ffmpeg)
 		$(use_with ffmpeg enc_x264)
-		$(use_with ffmpeg enc_x265)
+		--without-enc_x265
 		--with-gtk3
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index 05cbf8814ab3..08e2503c90e1 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -63,7 +63,7 @@ DEPEND="
 	x11-libs/libxkbfile
 	brotli? ( app-arch/brotli )
 	csc? ( >=media-video/ffmpeg-1.2.2:0= )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] )
 	jpeg? ( media-libs/libjpeg-turbo )
 	pulseaudio? (
 		media-sound/pulseaudio
@@ -156,7 +156,7 @@ python_configure_all() {
 		$(use_with ffmpeg dec_avcodec2)
 		$(use_with ffmpeg enc_ffmpeg)
 		$(use_with ffmpeg enc_x264)
-		$(use_with ffmpeg enc_x265)
+		--without-enc_x265
 		--with-gtk3
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 5d43223e9e54..8edde66e56e6 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index b1616717f94c..a4fda81fdb1c 100644
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-screenshooter-1.10.3.tar.bz2 601717 BLAKE2B 825e939e56e8c11b42454fd14240209dd157b183525349c51979890ad544d69c9dd95264ffddb4956a0829598ebabd119ff01c0b9cd95115491b79cdd6168212 SHA512 c5bb43c7cbd15cdf276ff5dd16e0e102862b974cf32b725bbc0d33fa60c713e1891706f3a6e38150e76e9c876e5d0b1be277d3031a3ae47696056182ccac78f8
+DIST xfce4-screenshooter-1.10.4.tar.bz2 615583 BLAKE2B ef6b4db15320917b287604f8a32498c4ccd5eccd2df37ea67366b77a44d962ab2f6d97f6a23c75bfad7483129fd66dd5e8b3ea76acaa3738ba8edf52c2988026 SHA512 7d5eebf897aa2b45e92e4447052c58813c34aa437e10f61712ff50b96b3fa954849a4cb6bf0720659e4c2a596e9f09f79bde2ebdab98b4e8c35fde25a7839011
 EBUILD xfce4-screenshooter-1.10.3.ebuild 1249 BLAKE2B d221ded378807c008fc3a1f287859068ab3b57b120d291a867431cdf0e584f149627a8fe2344d7f8cac5301da43d5b9685727ed8125419906051754d29874028 SHA512 cd6f86df686e6ad3702a97259962384f08002cabedb85452dcf1671eaaa918a867cc56e7cd3ff8f4fb6166ed9aa23df2d22420aaed4fe60c132b86910e17caf2
+EBUILD xfce4-screenshooter-1.10.4.ebuild 1254 BLAKE2B f78dfc959637a1dde6a3953e4186d71799a89888c45650db9fce729155fe679f61724e1d37bfea01e7c34eed8853aac51a8c089c2fbad848ce4de3721efd60f4 SHA512 607dc380e2429a2322d0f640f69703833532f2e238fcd704a09923d87467b5a1960553dba5a07901351d5e1aab8879161a3d739e976da90a899e97dfa93f0eea
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.4.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.4.ebuild
new file mode 100644
index 000000000000..9eecfb4603a8
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.10.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Xfce4 screenshooter application and panel plugin"
+HOMEPAGE="
+	https://docs.xfce.org/apps/xfce4-screenshooter/start
+	https://gitlab.xfce.org/apps/xfce4-screenshooter/
+"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.66.0
+	>=x11-libs/gdk-pixbuf-2.16
+	>=x11-libs/gtk+-3.24.0:3
+	>=x11-libs/pango-1.44.0
+	dev-libs/libxml2
+	>=net-libs/libsoup-3.0.0:3.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libXi-1.7.8
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/xfce4-panel-4.16.0:=
+	>=xfce-base/libxfce4util-4.16.0:=
+	>=xfce-base/libxfce4ui-4.16.0:=
+	>=xfce-base/xfconf-4.16.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/intltool
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local myconf=(
+		--enable-xfixes
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}