gentoo auto-resync : 21:11:2022 - 07:03:53

author: V3n3RiX <venerix@koprulu.sector> 2022-11-21 07:03:54 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-21 07:03:54 +0000
commit: 1ad2c51f9cc380c164b03ed03acda1c3fcc0a476 (patch)
tree: dd39d93cbea55db38069a7fed0a1c8667b7d88b3
parent: d32022e7301aef2b3f52f6b7a3de81c6e03ffcaf (diff)
82 files changed, 443 insertions, 200 deletions
diff --git a/Manifest b/Manifest
index 2da47b83cf3d..dd5c2d2d1f85 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29625 BLAKE2B d89bd687ac9ad4eb30c05713a5025b6c85c8cf84cfdb61692665aec5066c4f93d687b608a09f742b644b972edfd49c6c87bf74e29061f63f600663791166858f SHA512 5e26054d50fa09a9ce16adb15eeb109dfc4a31bd9e8205a858a858b84d911a0f7e7128c75ac2ded23603acb797306f7ec000011283f78a36dc6501db7b672cb3
-TIMESTAMP 2022-11-21T00:10:09Z
+MANIFEST Manifest.files.gz 29630 BLAKE2B e6402be904123276c4e4cf50ab9023843b919a302694b19fb068eca9825d6f708f78e2231b7651ee0fb6e389130837a81549d596d017da32298a23fa63eedbc9 SHA512 a700acd722581d461e01c1b543d473688fe5ea638e6fee9263ace7c673f64e693cd7600093b50d61c2dd12f697e222518d7a5ed5e1f0ceac26b8d68f138a3576
+TIMESTAMP 2022-11-21T06:10:09Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6weFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN7FkFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBmjw//c2LczPVfjH6lg4HOoKOx2yvQuPbevoFUxO+pTyTHtRB7MCi1VujTmtdg
-lBAnHdLZ3LfuBX4h2epQdZL6r76OvO/dwNGi5Km+sUXfn5P6msajAet50A00mC/B
-ptfhVASITZWPg+MA3jHAhkGbty6laGcuu5TitDQlw3OyW8fj7FiSL5FJhCxhtlYb
-T96Gap3AgpedEcNIcNXyTE647R/r9PXiCez2nfZ8thb57q9fdZqEA/sXUxJqjKjU
-yoD1aXUey8vms/939GK6jW1or/1zbHo5rA1Jrmwzrdrr/V432Xp2CzWammCo4qgf
-nlVxwdzObns8fKrUpSt6MgqtQKl+Lw+dXO4UNrnt6HZ44ZH7sEbwCDUzwupcVBnS
-xrXKOtq8AycpydZsPkDMoo8VOSyRFC83bxWFgUrO+Z295ipWPgdXfM1JYDhoU/Xe
-QQL+R8uEReW6IIBMyjJ+Lvi64T5j2FqHFFMHLEGKWxuOVruvbm6eK6uGkWXNYx3X
-verGcfwXxlZ7gReysrE1U02cmcX/+o45H9h5G9e+UhdDPQjoBBjn4s3dpvQH8vxh
-N5w71wNc2Q4Wc39wu/hoVVaXHUjwq0WaBrrixRjtsW4FkFrZdvPAS3lY2u5OCMvg
-aFlLoovL5uAIddH5D0zNxZI0n16BIJpLiMww5UNHv1BZihS9l7c=
-=cEfo
+klCESg/+Puvi6IiOvgyqzcOJF09SSRTWdfpxa9p2Mh7Sxvb4Jh/xEsmxJWuS9rFA
+sFPvi1HMwI0AcDjTX1gC8wB22shETafMHP/Nb287EZh4aCXhdjsYjRE65VDO0pBd
+bOkewc+6hJV5g2NvpeBXd5XB1gnV+KJPBGXyHiDQSvaBWCFzWz2iciaxdjpUhXDI
+OXPVZXqoBRhzJVx8Z1nemB65FSk1mPBj9xADEa6l81ZMNnNpoca5GPY/LxluG0xd
+6Y11tAmgdbcmmhCPubYZB8MJCx5vYgpOxwkPyKyx5OBjR/PLPVExjAq8q5Xa/l9/
+M88QNQ/6OfSc8sahNZXuPHykkuWoyIFuqDR21vpHEIrtut30FB6DpF0RkIrY1KIx
+t3s6r8a+XCUs44dCQKCw8yWHCyP1ZL+Xj6Wk8Rrq8PDfEE2Un7W9IIYhPO64YJnB
+OEvYr2a5pz5mb4uq0+2pdWBL+UHZhs4SaiMpG1g68LmFBU2u9ediH36RVWRpmB0R
+1X6BDKKiZPPgMHWjiVSImkVjZWNI0voily6vnyeKPc+J5atqIXPVaxIXsx4WbRlW
+QLv3ACNdCLppMJbf7wx9pkYkHy+03Sgv2LPdqzRWpDmSHPkAHXRLrbZpNSaAMnhM
+uswtrTwouLJWCXvA8588axz4MfBOq0bmLiSq75kAINNi3Gqv390=
+=b+Cb
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 822bccd26187..a9d114909d91 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 47d6a2b25ca0..232a1edf0c48 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 92678553ab6d..65d2a32a088d 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -19,5 +19,5 @@ AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
 EBUILD a2ps-4.14-r7.ebuild 3595 BLAKE2B ceafe4d3667ce8c7c51cd06516453bfc3847c0aaa57e30ae4544dad5d366bbf87a4ebf4eddf901119e2c68c19b0f93c1261a930a97b860d51dde04f13718afb4 SHA512 63d1f39badc98876d18495ff639f0e72a622b3708928669a15ee1e519f531e2ded974bb433bc0f10b033d2b5f2971a5451f59736b1c3ec44aa18e051f4d08e97
-EBUILD a2ps-4.14-r8.ebuild 3082 BLAKE2B f8108f80eb6a8a9042606c14817dc9ea3b72bab5854a0af9b38d8196c5c80a0461c1bef0bab71891ab30d1cf63153854b8b45f95ff370e5a94730c9efd9e8ed5 SHA512 b651e952140749643ad46c71f752fa9bb2935f464b2ca7e70a01125f32939deb5b61f084bb746d773285975936355ccb6f19926d0f60b305ca23ee9205bfa451
+EBUILD a2ps-4.14-r8.ebuild 3080 BLAKE2B 6db6af54cac53b263ba9b484f5d379b4209d70abb6231dec482e6762ab23c9740828026dfbddef29162f13131c459680fc5c23ec5ba65c10729562923e8cbfd3 SHA512 b0af0f343c4e45f57015e5f09bb68ea8052193f5b5c81172a0df71edb42450fd1fb261e905066fe6b8549c4022856cb6d9955ebcd42332c7d6ff42af77dd2d15
 MISC metadata.xml 442 BLAKE2B 89796eb65cfc9ab8929511f94655a9c7f6a39837f5c1cfb0f8885a29d3900512e6c3ee6b44f3ee8e23eca54112f72c7462d4fb223109fdea3d203d5ff4492252 SHA512 078d824c815b9cc0c5a0acfea6f8c5203eb3f1e94778987137181f987cbeaab0040389b0e34cda160d6a3c6f00508c39a6c30404b89dfe64782db1980c9340b7
diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild
index 12c541774ed3..f99cb9cdc64a 100644
--- a/app-text/a2ps/a2ps-4.14-r8.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r8.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${PV:0:4}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cjk emacs latex nls static-libs vanilla"
 
 RESTRICT="test"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 847fc48e62ea..862429924aff 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index b86044fec279..186f32229134 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-bdd-6.0.1.gh.tar.gz 60932 BLAKE2B 67e0dbc251ce94da40033641f37e6c9ad70ca947f71db1a78907a6890d96d8d3112d57a2a63dda526c8f846010d39a575cb5d93a102f4653705d4229ee14ab07 SHA512 30bc697ae177e3f311af0c781e99bde5b491dfef28109359c0d80f33feb8b0b170ffe15c288fe73a624144a1d1c3223b220d591b4acc30d1ad53600482bef87d
 DIST pytest-bdd-6.1.1.gh.tar.gz 79549 BLAKE2B 0de77a2a46c852dcd7b344b385deea6473ec32dfec2eec610ae04d9d192d42eaf7aa3b1455549dc602e46c24edf078c558f2564aa9dd7f42a2beea36458438ea SHA512 69cd345d4a819a84a811ca2a5825f87a46fa4d063b9a852308d36e4f15058a27c45b170dadf684e68322d3380654f985b8ef153e34ad42ef33e0b595f8dc9d96
-EBUILD pytest-bdd-6.0.1.ebuild 1084 BLAKE2B baa7bbb71d57683cb4b03dc4fb15ffb510d214df05fdf714767767a73846b6543188ab4af6b931db3c3362cad3b945e271979837f1168a04dcb32c9acdf06549 SHA512 2df002e33e225db79ddb3f6afc9c70e7d1d6f0ef29aad3c8f44189cb9b86faa430053dcba31c3ddb2ce6f8ba5367873d61688b0cc6ffc3208af49868eb566118
-EBUILD pytest-bdd-6.1.1.ebuild 1060 BLAKE2B 692476c5c0f0fd307843650d1a4c4e73ef612149739d75a5ba4a37326c6cbf34d30f347cb76d8715ae99e10d97c81123da89767e150967d35718dfe12cbf898b SHA512 4ad8dfe906c93d24a6746e3b9b16a379634dbe7382b835ad862da881ad6fdc7ead4f95646a91cd2b45eae487bb8cbe1c3578f3cf8262f8bf081f24425953e9f4
+EBUILD pytest-bdd-6.1.1.ebuild 1106 BLAKE2B 500ed1bf214c074cb13f1df478dddc020d470a44f6cd21a1f1a69af2c32b791e53f9f216efe25da32d4d8188bab4729d94ca6c056c917df64efc3922da9ea226 SHA512 333b076aa7cd4bd7253ae15e9cf9598083c15618451fdd0f749bcde77251956d2d02e76cad27cb9cf39123a40e1ea16f82e006670a56673b42a76f91580de2e2
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild b/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild
deleted file mode 100644
index 7682168ff49b..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-6.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pypi.org/project/pytest-bdd/"
-SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/glob2[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse_type[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pytest-bdd/pytest-bdd-6.1.1.ebuild b/dev-python/pytest-bdd/pytest-bdd-6.1.1.ebuild
index 5d7b8445abb2..39ee70789605 100644
--- a/dev-python/pytest-bdd/pytest-bdd-6.1.1.ebuild
+++ b/dev-python/pytest-bdd/pytest-bdd-6.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
@@ -21,7 +21,11 @@ RDEPEND="
 	dev-python/parse_type[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_tests pytest
 
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index a8269f90a0be..1f849eacbb3f 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
index 77357045e465..e6f2bc763428 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -1,6 +1,7 @@
+AUX battalion-1.4b-clang16.patch 163 BLAKE2B 6810ccb4963b494417a43c0f115faba53157aaeafb125ccb6bd925efc7c895612b9a03b502cb1b3d8e12937953b95f3a7cb95c9954eba11bea6efc871840a4dd SHA512 c8a478f33dc7d7af80a98d0f1b65a03cbc82697f45c288061bf62a20a91d73db0a7877c19fcdf14ec431be2ca6828efd916ad3d1d64a136c17caade11383dbfe
 AUX battalion-1.4b-fix-build-system.patch 1923 BLAKE2B a6c8ad95fde5629f1e49532ddfd0d7f81c40fdbdec934fce876b27496a71093c9065852e3ca912f0827be3989f09fa400512fe2b627fdd3a8804a13177664481 SHA512 ea078f3b6b7ac1a4156840c8479ecf4cd0cf17ea74c7aed6bf18a7894b9f7f0555a74c0e1c1188358f496b9b6ae2309289637cb67f2c5b80b0c2bfe09499b2fc
 AUX battalion-1.4b-warning.patch 335 BLAKE2B 89980f750f2b7ca871ee9b37c0e07f39744cf577c117a99faf5cdd0e3ebd00bb21a3d39a66a0ec48e365dc14c81c822c1a8523925d11ef6e6ce182c82ce9bca9 SHA512 721f466e3c52cbac0d68379028e3c01bd86ab148f59f7d90ec5da536391781d6074cf3424727ba62d9e6991944ac49ea5ab3119ea6d9bf18eaa7e745ac52ccfd
 DIST battalion1.4b-r1.tar.bz2 1103031 BLAKE2B 393561b879813244c90cba1fe1186a65920bf383926c06c28f1ce3a04afa66eab08f3b35925495bf4ca9b0d37eb1925bad5cbace602a8cb575cc4d6c5410fd01 SHA512 5c2acf7941cfd4ae4c7f46b3df7c7e6090dfd099276c67b0de83a4e6e14de00b099814980a12bddf1349407e7e1e62f91da5d0da842fd26f240b9a6cb37ecb04
 DIST battalionSUN4.tar.gz 1593265 BLAKE2B 239dff49c4d2c33a440594c113f45d347e598935257e30a04a18bd0f6b440b7790436000213fcbacfa862187f4760b9927539977f144ff5e92d7dfddbb7f3d7e SHA512 1e1ea7c7232b99b01a85fdf0660877944d64172b751df1dcd63a6cbeb4179078e80879aca77d84bb37b68fcf082680243987d5b65c77e5ea48e8f5645f9b2ef0
-EBUILD battalion-1.4b-r2.ebuild 1722 BLAKE2B bbd3442eb54c5ed51d3902d7abd9f424a974a2fa045a142ee7c9eec022a1939ecd2d82cfdf9ba9fb92ead38e001a1e2b53cf482d23e6d743cd439fdd0df38024 SHA512 94096bf879c0800d741b436ea5fe45785ced3e5b07bbb83d91c38678d139c5e13bd52685ae2405ff5338e85305e8469c19097301c5d5b861c33c8a48b93db553
+EBUILD battalion-1.4b-r2.ebuild 1779 BLAKE2B 6ff63802618965adbf98d8c233c927d318ca131e541d63558cc3de822a04e4208aa9dcf74867af49c45978be0a22d4e3cb3ec4fffffd518af7e30f33249f6d30 SHA512 b6fceeb6a6ea07846d0358b6a22ea72b269279085494905b71bfd22a949e1c6cd5c9df8ebc1c3b76351a820d86b67ffb018ae800783ffa589bffe5b18b07295a
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/battalion/battalion-1.4b-r2.ebuild b/games-action/battalion/battalion-1.4b-r2.ebuild
index cf5a5613754a..db2d3d24992f 100644
--- a/games-action/battalion/battalion-1.4b-r2.ebuild
+++ b/games-action/battalion/battalion-1.4b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,12 +21,15 @@ RDEPEND="
 	virtual/glu
 	virtual/opengl
 	x11-libs/libX11"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-warning.patch
 	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
diff --git a/games-action/battalion/files/battalion-1.4b-clang16.patch b/games-action/battalion/files/battalion-1.4b-clang16.patch
new file mode 100644
index 000000000000..866e6227de05
--- /dev/null
+++ b/games-action/battalion/files/battalion-1.4b-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874987
+--- a/battalion.c
++++ b/battalion.c
+@@ -5471,3 +5471,3 @@
+ 
+-main (int argc, char*argv[])
++int main (int argc, char*argv[])
+     { 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index bacb07fb4c38..4a0a0354b0c8 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
index e1f066eb3ab0..0ca55caa8944 100644
--- a/games-arcade/grande-KXL/Manifest
+++ b/games-arcade/grande-KXL/Manifest
@@ -1,6 +1,7 @@
 AUX grande-KXL-0.6-cflags.patch 387 BLAKE2B 6ea42eaaa8f3fc9d97b5de7c613f0998a7fb4b2088ef2d9949013a6d8b74e064c9913c9e8b4dda06650ea214902340d36b19d2545fa0366ddcba688fa433a797 SHA512 a330b5c8b97d941d13c90f5b78709df823d1242765890439a195f6788443c9d13bd5062399d1452eec9f311e6dd88e72d932398f99cdacaa94bc6d080550167c
+AUX grande-KXL-0.6-clang16.patch 590 BLAKE2B c8b9a613c7aad9e19880009dbc28334fd8111b96f0dee0810c3359c72541ed7f7261c9d9f67c883c3952537e56c8bd3a8d0d0a7fdb8f20d32d55bbee32883fb9 SHA512 e1194dc3f8d9f7480c0a825d388fee706f8d4afe5e5cb6ed54da9c03bde733112859eec5d9fc94cc3738a7bc73046863700283cc07b0f8a2233fb76b92ce692a
 AUX grande-KXL-0.6-paths.patch 211 BLAKE2B 171ead98a48f78e1a5ee909976bc0c1b7a07e01dcb4d53e799c36cc00eef9defe0cb38bd020fb3e0f38bfe92e9f0759f1c123d15779d4e7c0a5c46940d06b863 SHA512 505682a0e01308ec30890d9118c525bc69914b9f866566e35f0c95ffd4226e8d73ad63743d896dd07f1c4c2fc980cfe6043c75e12f28813358df1808947d418a
 DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
 DIST grande-KXL.png 5949 BLAKE2B 4461b7f90c2abd332708c81829a5b03436163d7652f60c424c2468d08987338febf147457a16794123a7a6d5e64fea06a40071fb3e62fd5ea7bea6dadfb3dd2c SHA512 4fe68a2fa0cb3e57a590cd818953e82b3456d7e160f12d4a87d2160acf6f6b37d39da2ee1df96f14396c5a86765ab6c66e05c62a8fd246a1ce01fbec962be67d
-EBUILD grande-KXL-0.6-r2.ebuild 937 BLAKE2B 4a41e4ec4b27c767cc978335225061163ac9c1cbeca29e5d48aef3e4833d1e049cb157c4cc98014e5cfd01aed146cd48e0fdce3baee2e7ed2fb8a70514a49f25 SHA512 cf1402d6fe9ba433b544fdd6e41adb9d317d47642b84b7c593ac6be8dc97a2d8fe3ce49037ee08cb960c2359cd7024a6c05059e8f72312d108d5b75073ab9173
+EBUILD grande-KXL-0.6-r3.ebuild 971 BLAKE2B a6800736092ce1395c2e61e4d560e8a94f07b3544f73b46a85ea779609fa4cf9da8a073dfd4e4a5cf89053f31b071732f3d80c1dc7db54235dfba5e66d24d090 SHA512 50ab94d3a49d2c73906868bfc1f0e67b6fd0f9ca6d1a7afe7de7f1db70ea0154f9324dd7d033a7f910de557e809bea6247d1352b38c0b57ce57e667ab50b3371
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch
new file mode 100644
index 000000000000..7bc4a9c380fe
--- /dev/null
+++ b/games-arcade/grande-KXL/files/grande-KXL-0.6-clang16.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/874990
+--- a/src/enemy.c
++++ b/src/enemy.c
+@@ -984,3 +984,3 @@
+ {
+-  static fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1};
++  static Uint8 fr[8] = {0, 0, 1, 1 ,2, 2, 1, 1};
+ 
+--- a/src/grande.h
++++ b/src/grande.h
+@@ -13,2 +13,3 @@
+ #include <sys/types.h>
++#include <time.h>
+ #include <unistd.h>
+--- a/src/my.c
++++ b/src/my.c
+@@ -527,3 +527,3 @@
+ {
+-  static fr[8] = {0, 1, 0, 1, 2, 1, 2, 3};
++  static Uint8 fr[8] = {0, 1, 0, 1, 2, 1, 2, 3};
+   
+--- a/src/ranking.h
++++ b/src/ranking.h
+@@ -10,2 +10,3 @@
+ void RankingScore(void);
++void ScoreRanking(void);
+ void ReadScore(void);
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild
index f93c692bec64..13d41d77c5c5 100644
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r2.ebuild
+++ b/games-arcade/grande-KXL/grande-KXL-0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,6 +25,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-cflags.patch
 	"${FILESDIR}"/${P}-paths.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 84e21bb376b3..ee337fc1c987 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 4666bdc08b18..07e3edc64608 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -1,5 +1,5 @@
 AUX desmume-0.9.11_p20210409-fix-gtk-cliopts.patch 2969 BLAKE2B 8aa75d966e74a1d274f923636c9984558a738566b9e3bb101c30182d5929753c2ce528341708a69ab5db68c348e34a79590c79e8b8a6181f639248eb5381edb6 SHA512 a438cbebb2ba06ab66b9643df9ec9b1e922f02478a50d5cdc81cdb18ff688f48ea28fc289305dc5daa2f553760dcd0b1a02c729d48e9fd9b35f03a79a9096c07
 AUX desmume-0.9.11_p20210409-openal-automagic.patch 315 BLAKE2B cf203d506460deb88b6bc366d993e2376ebb6b2ac6d4e9c1d8eeda3aba0e0ab4ffe994c5855cf58babd2d25f86807289dbe48a37cace30732ecdc47363cdcbba SHA512 5d584a18595584ec8f23b74ceef5e3667d4e91a3b35def7cab715a9325a797f1b457dcff4dc804088aa047be49b0f828a28800a4713929ac4073bdf7a99b3b25
 DIST desmume-0.9.13.tar.xz 10437780 BLAKE2B d5ca5ec66aceff3d5aa5adf338a44cced4d30104f288172f4438a88402f9af0c161d1f0cd0401d184fa66ebbde684d4cd206179a7f6377d27e4dd9ae3d3e7bcd SHA512 b756c5a5d79479e38c6135e4dcff3bdbaf78a4860699320305c81056bd6e7b8ba4db3c3d3879e2ac226b095783357b9f579c0486cafbbbdcee8456e1469efd9e
-EBUILD desmume-0.9.13.ebuild 1161 BLAKE2B b7cee8744702dee47e3a3af912a36cfbd719cdc270fedde283f9c6e7dad2f6f355adf37137306395645f29e6e3292979e08ec28f703d9d22793cad1ed5b6ec15 SHA512 6771f8f9b398e048030ffc217279df562af74f965bb12a8a90bd25469e7487e55dc75772c3d9c4389ad17542f51e3cdab82fd7ac14822feba456b0ae06aa6f7b
+EBUILD desmume-0.9.13-r1.ebuild 1288 BLAKE2B 0e3d401df8a5a07584d03f24f3cd005cedfdaa4cbd66fd365a91a37f50255ddd08d3e8f802d37c0bc338dd80c19d4d8d8b804f8b0a1800d98bfee29daa4af298 SHA512 330dbcad772b96b6cc011b7ae79986995f844b4ad2e960c6079a1623739c3ad0579ca349e6e891c7cb7ce4c175904111ef080f055623131eab832115935a4486
 MISC metadata.xml 634 BLAKE2B 91988d51bd4fc569685d68014de840113a5c046c33fe07f638af08d57c35cb92976a5004c23047e1fdcab2349426a70e2411ca654b46b639a335ee2a1d58a97f SHA512 28e671fab8e8aaef4d6573fe8d5cf490d1e1288d756240b27370eb58a631af96c2078a2fdbdc17320515b28c86cd90f3399299f7d00f9af6f1c91ce7312a8301
diff --git a/games-emulation/desmume/desmume-0.9.13.ebuild b/games-emulation/desmume/desmume-0.9.13-r1.ebuild
index f4edfb4b5a3e..105f0464ab1c 100644
--- a/games-emulation/desmume/desmume-0.9.13.ebuild
+++ b/games-emulation/desmume/desmume-0.9.13-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=8
 
-inherit meson xdg
+inherit flag-o-matic meson xdg
 
 DESCRIPTION="Nintendo DS emulator"
 HOMEPAGE="https://desmume.org/"
 SRC_URI="https://github.com/TASEmulators/desmume/releases/download/release_$(ver_rs 1- _)/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gdb +gui openal wifi"
@@ -42,8 +42,11 @@ PATCHES=(
 DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
 
 src_configure() {
-	local EMESON_SOURCE=${S}/${PN}/src/frontend/posix
+	append-flags -fno-strict-aliasing #858629
+	append-cppflags -D_XOPEN_SOURCE=500 #874996
+	filter-lto # odr issues
 
+	local EMESON_SOURCE=${S}/${PN}/src/frontend/posix
 	local emesonargs=(
 		$(meson_use gdb gdb-stub)
 		$(meson_use gui frontend-gtk)
diff --git a/games-emulation/gngb/Manifest b/games-emulation/gngb/Manifest
index 1a9c426f7284..ea22a097c3b9 100644
--- a/games-emulation/gngb/Manifest
+++ b/games-emulation/gngb/Manifest
@@ -1,11 +1,13 @@
 AUX gngb-20060309-amd64.patch 982 BLAKE2B 767efcd0db8ae30296a2326ae74b16f2ea776bee490a77ae6c7960ed96ac127e54e6bb896cc4bcaca43a5c3a5508ebb0bcad17c5c7af3add1104c95540090811 SHA512 91f3782ecaeac60ad60c14b8e173099683e85917765f1d8e1ce92edbbba929042e0254c2d7f4432124c1dd2c8965603e88172076bf4e3c6b427e8c46f25c0312
+AUX gngb-20060309-clang16.patch 1939 BLAKE2B de2fc6717cc3dfec2ee139c53e3e0e217d1b089310602599837df78a9ded5db4dc92080038b6a85a0b5d18e3d7d2bbe57533a3f96910d537029c6af2d653fe07 SHA512 ae97781fe687e08367bb358db05b8028caacf3d0ac8f65ccb90031bab49f8ca239d81feeac6c8e4369016978a6ee49e1f4a4eadf8b4cdf3f6505e39b3a30386a
 AUX gngb-20060309-gcc10.patch 10283 BLAKE2B 1979b78167df37698ab1884ab348e1e4e1ef0de297d94783021bac7f5044568a21077fc1de539bbecaafb00a4ba016e83dbcbd288c9473a48a740375bbf23f10 SHA512 edb8d21877eea65399c529f83f7a39061126e9d4e107b8c064b20a2a2287ab520c81a83bc3b64d6845d9e4f2134cdb0e79b4ebe5e99a998098d4e54ead4beed4
 AUX gngb-20060309-gcc34.patch 623 BLAKE2B 8861c3224bc01d4ce1ec5c062d473bb2ad6f533e834550ba7d53f416d684c44580169d36aa016a65d916f8ffe05aa336f1b60da285e253b7aa288c33f8518860 SHA512 651a0771d1b43762083bece5eb12ecba5833774fb095bdb00c0031e20d11b4a59daae4bdd519a2840a2dd5aa5ea0a852d968da7cf96de8acd7ac1ddd90968167
 AUX gngb-20060309-gcc5.patch 818 BLAKE2B 8b937260859a3bed1339f3d3a253fcc58aff3991503f03fbdc529446666e7a0c344469d10793e6ab31dba42f9b4db4b29181e1e3bdaed23bc41175056cc5f747 SHA512 f61dd42c766ee9fcdd02228401011b38dc9ecc7e87044b34f6d726a4fc9862ebabb39223b83967fce247a675a6cfa8037747e49ead4077b9a0aff522f7377e79
 AUX gngb-20060309-gcc7.patch 1693 BLAKE2B a47637993a219502c6f81750987ea7679935cd07e7cb2ad8ffbdb648a8b11c329ca55585949f172c3b0ce2b18592572a37c4302d59b9172e4d481d1a81871644 SHA512 ff73a5344c1b3d090fbd16c774ffb535f4586cd2b876f71654d1e3e127c1527bb9abe096e24f6c8fb5cff2d19c29b12aa1e6f56e760b00362ff44755711ec433
+AUX gngb-20060309-gentoo-zlib.patch 246 BLAKE2B 217d38d0ebaccfdfe872f7e83257848e21d1bfbaa1fb7bdaf4eff4dbad3d48e0ec98b145a876c813e08c515c599235f6392a93a7171d50a78bd4b3e2cc8c37ee SHA512 9a3b499617f9010e2aff500b649e933d4f9407da279111d60542c63e0c9a47a6ca65956a7bb993bf717459d9edbe72dcfab2da63270fff560448eeebfd612598
 AUX gngb-20060309-inline.patch 463 BLAKE2B 8946f6bc81e518b482fb93bac335b3a15a728736a06bb753692d6ac896d1ffc4f550d3aff8b41dbd1bf5d79d38c5c3edf969b7686d9fb05e654e49384d65055b SHA512 6a1916555f7855abde4a1ce3a6ba19575c3b92cd8e3eb9283757b54e1747ee37dce7005c2311d9faaeb5059e8157c742abfba072c912b1c6d5e40555a28c2b25
 AUX gngb-20060309-joystick.patch 2162 BLAKE2B f2c9bf3aad5468e5a4e587489b0737270c07d743a7ee710aada49a041f73d6a8afbdf4b8f1efa7ec2a582603b7a39e75c5b33765d965f9b85538dc7a7ff87d01 SHA512 535fcccfc986fdb4e555d0edca7ad4cbe33ed656a904bd32d4de516a4735ecdc7743e58e38a20d2b6015f515f7dbed6260a974ec92797b497a111b0e5bb1c24c
 AUX gngb-20060309-qwerty.patch 590 BLAKE2B 1042df2d545203547a691322ddfee05a76cd9a8a099e7ce14917f7b93ccee606ff9746a88c056409b838e4cd4a53703248bd1232be177d582a7774a80cf141af SHA512 756923c0d35b42adb69da6bf7c3c7cd89adc6402d758b8f2f50d2e527181841685b108cd9903c70a2e62b7ce3319dd1a784045866d50d9a21eabc870115779b9
 DIST gngb-20060309.tar.gz 168911 BLAKE2B 9377b107c3318041cf903de1661ec6a43078e1cade77b2899b6412616b2c5c32e217d5efc69fcc5324c75242f880493b1b3e678c5bc0a71a4a3ef2dbfd756b4c SHA512 169fdb94eac439240ff15fc2337908cb40e06259338d03c0193a0cb04acb9ee688832fc3157ec56e4e541a8889c4b1a4e7d0efb035b5829ffb856192b60d259f
-EBUILD gngb-20060309-r1.ebuild 988 BLAKE2B 8100a070924fe48d9ae4b0cd6a0bf85b049876cdab48a21fdab83a759ea11e50edeb6974a091120adb7455b2cd0c0aed59f05d5b25b659a99b7ba5bb09f75120 SHA512 904f06f7803a6f88db3b57626c1353a300cde87f047fa2f8b3dbf15d279eaee93c58d8b5200b290402af27c041d0e1cfdcb6410772af38ea054998547da530c9
+EBUILD gngb-20060309-r2.ebuild 1064 BLAKE2B bc9b8c140efdd096d52f9e6536cdacf50b6e639cf4b3aefee38a331bf4424d5d41e018494661d30fff53ad04d6acd4e51ffa04a612beda3eb3232c61985ce6d5 SHA512 a2ee1c1f92df3372dfe20fd6d05446e3011b9e4cef135c6b3c2aa32d512e299587671a7c7a1661cc93c84662e7d39d6f46620045934158241f0a41787e9a55bd
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-emulation/gngb/files/gngb-20060309-clang16.patch b/games-emulation/gngb/files/gngb-20060309-clang16.patch
new file mode 100644
index 000000000000..c365ec049873
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-clang16.patch
@@ -0,0 +1,100 @@
+gbserial_receive/wait_data() had issues but the functions are
+not used, just "if 0" rather than make sense of them.
+
+https://bugs.gentoo.org/858641
+https://bugs.gentoo.org/874999
+--- a/src/fileio.h
++++ b/src/fileio.h
+@@ -42,4 +42,9 @@
+ int gngb_file_eof(GNGB_FILE *f);
+ 
++#ifdef HAVE_LIBZ
++#include "unzip.h"
++int zip_file_open_next_rom(unzFile file);
++#endif
++
+ #endif
+ 
+--- a/src/memory.c
++++ b/src/memory.c
+@@ -32,4 +32,5 @@
+ #include "serial.h"
+ #include "message.h"
++#include "save.h"
+ #include "sgb.h"
+ 
+@@ -72,5 +73,8 @@
+ Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0;
+ */
+-Sint16 joy_x_min=-32767;joy_x_max=32767;joy_y_min=-32767;joy_y_max=32767;
++Sint16 joy_x_min=-32767;
++Sint16 joy_x_max=32767;
++Sint16 joy_y_min=-32767;
++Sint16 joy_y_max=32767;
+ 
+ void (*select_rom_page)(Uint16 adr,Uint8 v);
+--- a/src/rom.h
++++ b/src/rom.h
+@@ -55,5 +55,8 @@
+ extern ROM_TIMER *rom_timer;
+ 
++int check_dir(char *dir_name);
+ int open_rom(char *filename);
++void get_ext_nb(char *r,int n);
++void get_bmp_ext_nb(char *r,int n);
+ 
+ #endif
+--- a/src/save.c
++++ b/src/save.c
+@@ -1,2 +1,3 @@
++#include <time.h>
+ #include "emu.h"
+ #include "fileio.h"
+@@ -6,4 +7,5 @@
+ #include "interrupt.h"
+ #include "cpu.h"
++#include "sound.h"
+ 
+ #define FILENAME_LEN 1024
+@@ -646,5 +648,5 @@
+ /* Movie */
+ 
+-GNGB_MOVIE gngb_movie={NULL,0,NULL};
++GNGB_MOVIE gngb_movie={{0},0,NULL};
+ 
+ void begin_save_movie(void) {
+--- a/src/serial.c
++++ b/src/serial.c
+@@ -218,4 +218,5 @@
+ }
+ 
++#if 0
+ Sint8 gbserial_receive(void) {
+ #ifndef WIN32
+@@ -237,4 +238,5 @@
+ #endif
+ }
++#endif
+ 
+ Uint8 gbserial_check2(void) {
+@@ -259,4 +261,5 @@
+ }
+ 
++#if 0
+ Uint8 gbserial_wait_data(void) {
+   Uint8 b;
+@@ -284,4 +287,5 @@
+   return 0;
+ }
++#endif
+ 
+ /* New GbSerial */
+--- a/src/serial.h
++++ b/src/serial.h
+@@ -42,4 +42,6 @@
+ Sint8 gbserial_receive(void);
+ char gbserial_check(void);
++Uint8 gbserial_read(void);
++void gbserial_write(Uint8 b);
+ Uint8 gbserial_wait_data(void);
+ 
diff --git a/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch b/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch
new file mode 100644
index 000000000000..bff6f5d6af9e
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch
@@ -0,0 +1,12 @@
+Gentoo's zlib.h does s/OF/_Z_OF/, so define OF if missing.
+https://bugs.gentoo.org/383179
+--- a/src/unzip.h
++++ b/src/unzip.h
+@@ -59,4 +59,7 @@
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
+ 
+ #define UNZ_OK                                  (0)
diff --git a/games-emulation/gngb/gngb-20060309-r1.ebuild b/games-emulation/gngb/gngb-20060309-r2.ebuild
index 5644e9baf78a..6ce2b27a4cb1 100644
--- a/games-emulation/gngb/gngb-20060309-r1.ebuild
+++ b/games-emulation/gngb/gngb-20060309-r2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools
+EAPI=8
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="Gameboy / Gameboy Color emulator"
 HOMEPAGE="http://m.peponas.free.fr/gngb/"
 SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="opengl"
 
 RDEPEND="
+	app-arch/bzip2:=
 	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	app-arch/bzip2
-	opengl? ( virtual/opengl )
-"
+	sys-libs/zlib:=
+	opengl? ( media-libs/libglvnd[X] )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -32,15 +32,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-qwerty.patch
 	# Ours
 	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-gentoo-zlib.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
 	default
-	sed -i -e '70i#define OF(x) x' src/unzip.h || die
-	mv configure.in configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	econf $(use_enable opengl gl)
 }
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 42efa8239982..ea46e0aae991 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/xzip/Manifest b/games-engines/xzip/Manifest
index 198d7827f0f4..1249b696ea61 100644
--- a/games-engines/xzip/Manifest
+++ b/games-engines/xzip/Manifest
@@ -1,3 +1,4 @@
+AUX xzip-1.8.2-clang16.patch 214 BLAKE2B 1da36d5f892f99b9f60c854c858c1bca8155199d8c26c721008012d14c98e54fbc934cc61acf69e32cbb718d1ee05ce6e1651216a8261e71bcc5c217391ca0b8 SHA512 8d66ceea99d10d3f965c9bf57880fdb845f3827780b77c5ba8d4b36cdd837484d2f360931107864203c973c4af550c137c718d46fb074a7fded4fc191379facd
 DIST xzip182.tar.Z 136032 BLAKE2B 71c25bc8b353426c01938097e2a0ed7e027a0d7925dec50c18042deda3052ad0b1a613c7ff22d43f3712f29142a8c8c79924e17d2ae081147ccdbd5c634011e9 SHA512 b86099424ff35abd90737461e3d29d515d909b41c6a5411971fedb28f1f3284b13ea972380349f8c44fd39779c34258a99c5a9c0fb6a81e2bf919e9c38107bbd
-EBUILD xzip-1.8.2-r3.ebuild 602 BLAKE2B 440b97008c7122309cd6b10c6bcfbc91d58c1b6484bd306515a9207fa88113869e55884b6de82b69dfbc87268252f3195e9cb5e284d44ebedb8445bc621e3d18 SHA512 8b1405b729d612097ba2db3213bb60988e85d42e7f8bbf0d017fe5dba82dd094ff2dd769610cca998e6413917ff368c6b7aad1a2b504d326ec07277b3e12f801
+EBUILD xzip-1.8.2-r4.ebuild 649 BLAKE2B 814103728383fb8fd81331ed94ce5f17c4b9e49ff5d6da883f70633bcbccbf55038a59d7a0f4bc86c72748cb117c5173f644894b26eea748bd5ca74d4e714a9b SHA512 c001bbb8ea7400ddc21d0254799f0478bcb907945dbb1c6aa510389b8c85e6ea325d187bcc00c9a1fbfb91ce7034b5c6413b0d9a7ba1d8e1bb4fd6a3993b6119
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-engines/xzip/files/xzip-1.8.2-clang16.patch b/games-engines/xzip/files/xzip-1.8.2-clang16.patch
new file mode 100644
index 000000000000..ce702ba3e86e
--- /dev/null
+++ b/games-engines/xzip/files/xzip-1.8.2-clang16.patch
@@ -0,0 +1,9 @@
+Ideally belongs in xio.h, but using requires including more headers.
+https://bugs.gentoo.org/874906
+--- a/osdepend.c
++++ b/osdepend.c
+@@ -13,2 +13,4 @@
+ 
++void xio_bell();
++
+ /* File names will be O/S dependent */
diff --git a/games-engines/xzip/xzip-1.8.2-r3.ebuild b/games-engines/xzip/xzip-1.8.2-r4.ebuild
index 50bfddd967c0..04394c46e036 100644
--- a/games-engines/xzip/xzip-1.8.2-r3.ebuild
+++ b/games-engines/xzip/xzip-1.8.2-r4.ebuild
@@ -19,6 +19,10 @@ RDEPEND=${DEPEND}
 
 S="${WORKDIR}/xzip"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
 src_compile() {
 	tc-export CC
 	emake \
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 51807b68c896..1e8649e4d603 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest
index c43237c91fed..c67fb735fc41 100644
--- a/media-sound/wavegain/Manifest
+++ b/media-sound/wavegain/Manifest
@@ -1,5 +1,6 @@
+AUX wavegain-1.3.1-clang16.patch 145 BLAKE2B 9f1f3b20d0205f7389922ddcc5547680f755f9930d3f161247b8cc102feaff8c9c71b4baa435398a0e7aac2ac3230adb0205355958e1e2f11a7fb6d12ad20933 SHA512 d2c592e94768de0ae5fc5b6ca3026094e6e3b4ddf2f7840db5522e3293a0aea45a35d0c0b87138cd7daac0ba1b2656517bc26340f3219b31363c21177ad115c5
 AUX wavegain-1.3.1-fno-common.patch 288 BLAKE2B be7971168f7d7405ddb848ab3803ef1b07ce5ee0921a8e7636b513f84ab592ec0e0475670ac56c012333c229fe5e697126d29c3e6cf23bf1f938e0f68206927d SHA512 ee3836ff3792890c7aa152d1006ec81cbde359b807450b0d2a55298ac36662b62387d5f2926e86c2a6e0b19307452e509feb18e3bca1bc0cb7458f07c611a26a
 AUX wavegain-1.3.1-makefile.patch 178 BLAKE2B f24aa0ce70548e94835f2ffb8d4777bca32af36d09582e0ca65534e97c16f7509a9c499f22e5bcbec01049d979fbe5bbe152381a435d6575137dd2e5e99fdc44 SHA512 47c2e089fe6ff7a5db8f1cef2fdf18997ee67401e8666abb34d0c8d22a0961114c017e5d1adec8e12db90568ed4068d4b23b35cc915e8f6f8d4410b182dd02f1
 DIST wavegain-1.3.1srcs.zip 72180 BLAKE2B 99cccf2f2845ddb9109dec9eefc99a656ffe71f89be761db59c154c54512cac454663c669b2e586af2cdf7c9f5307e2d5335b75999e6d2284dcd799523572761 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054
-EBUILD wavegain-1.3.1.ebuild 576 BLAKE2B 78b71968d9e17fdd89b4ef0d57824dd8daf13980aa44c11f668b8b3df27828577ee009aad0de4f8abb2c5b0bc46aa2b71a6cbc0d9739432d943ddedacc15dd2d SHA512 622a712fe3abba3d20e3f034a901e53d42229f059b3e05ba16ec86c4104e1405ce07fc1e126abec9af9e2fa4948c6bf8568dd65d5339ac1f71b192a8269b2871
+EBUILD wavegain-1.3.1-r1.ebuild 667 BLAKE2B d83a761184be0ad155bf2f5546a66249018aa6cca4a30efac9f5a94854e1363e75dc602c07e52a28ccbdf82003a146d211736d74a30375c5d618777efa6d2508 SHA512 2e6e36fb1232f037d1191e8c2799f9e5994ed8d3cadd8d5fa68a143426722f264c3be66c3f0a7394ee40c730f2627cd249905a69b15f618b49839af0eed03dfe
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch b/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch
new file mode 100644
index 000000000000..7b14c14a0498
--- /dev/null
+++ b/media-sound/wavegain/files/wavegain-1.3.1-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874903
+--- a/wavegain.c
++++ b/wavegain.c
+@@ -51,2 +51,4 @@
+ #include <windows.h>
++#else
++#include <unistd.h>
+ #endif
diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1-r1.ebuild
index 9790a1958c4e..4af03be1334b 100644
--- a/media-sound/wavegain/wavegain-1.3.1.ebuild
+++ b/media-sound/wavegain/wavegain-1.3.1-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="ReplayGain for WAVE audio files"
-HOMEPAGE="http://www.rarewares.org/files/others/"
-SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip"
+HOMEPAGE="https://www.rarewares.org/files/others/"
+SRC_URI="https://www.rarewares.org/files/others/${P}srcs.zip"
+S="${WORKDIR}/WaveGain-${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -15,15 +16,15 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${P/wavegain/WaveGain}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.1-makefile.patch
 	"${FILESDIR}"/${PN}-1.3.1-fno-common.patch
+	"${FILESDIR}"/${PN}-1.3.1-clang16.patch
 )
 
 src_configure() {
 	tc-export CC
+	append-cflags -fno-strict-aliasing #860981
 }
 
 src_install() {
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 372142888479..bb7f2d876ea9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/setpwc/Manifest b/media-video/setpwc/Manifest
index d2243abed530..90d45174548b 100644
--- a/media-video/setpwc/Manifest
+++ b/media-video/setpwc/Manifest
@@ -1,4 +1,5 @@
+AUX setpwc-1.3-clang16.patch 154 BLAKE2B 9cfd310f85ffe088b1dc9cc2cfb8b49da7a4a8f768b83426577f31cf6bf5f508b0003b810b4314e726b772fe59775b82c981fba3294d447bb6e5492ffe0a5d39 SHA512 34a10148e369d01945f6fc5303d6223d92f1cbd8be815c011f2d6cc0017782fdf10d94dc8c7e4184f90937bed64888b96ba50ace9d71238e1a0dd78e09b3635a
 AUX setpwc-1.3-fix-build-system.patch 431 BLAKE2B 153d96caff02c439ba345ae9fe8c1a9b6aec42d2deeb42759c70f2060c9570fbc7d5b6d6de18899aaadc24c2529191dcd92396c2a6648b0710afc4836731f7aa SHA512 469971a15dfbf6caba99f9706c0b1aadaecd1752393915b7d01cd6607dcae63b2b51153918e21481b1be8507232bdae97d43db986e7a04bcefdd50b335418aeb
 DIST setpwc-1.3.tgz 9681 BLAKE2B 98ad99fa60eab41626320b9d1c70d994ac71084a16181f255dc79ae5741471952cbd8219ded173ba6f12f82f4ebd46c79e1414f03d43b913fdad576efea5a825 SHA512 17766dcd05003f30183b87dc37a105c26efcc387e77479259ebdbb565011533ca97909ea3b61d979578616b1269db53ffa74475b8b91a6e250cfedb161f535b5
-EBUILD setpwc-1.3.ebuild 557 BLAKE2B 642d49c1ad21cebccbb2ac6233691f849cf2687dc12eedfdae2a5fac2d921c825142a8a3a059d00df902909f873d225839bea5a7115734f93d44b15978a9fc65 SHA512 969cc64dc577293e990c630b8f6774aa3a3aa9c3e07bfa9979816e5c1d0cdf803cec914ae495076d022f17d8c257432d38776716253b527371c71e6ae52c403a
+EBUILD setpwc-1.3.ebuild 592 BLAKE2B 79d75126e26e0cc1e7b9c539c2795fddf6948ac7b9209fc82e4b4513ba621e0469b1b2eb5b15c25d0120605baecdf0b38295b91456d7cc7cf08bacb78c55f313 SHA512 d8c39c3411097ed46ddf49ee12f86ed2aa5e156c62169d24234f67d52a0ff0c25437d1ef8c9247b2931cb89ce713f488bcd5f5c76eff68ffad8dc55f39fff1a1
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-video/setpwc/files/setpwc-1.3-clang16.patch b/media-video/setpwc/files/setpwc-1.3-clang16.patch
new file mode 100644
index 000000000000..c74eceb09cdb
--- /dev/null
+++ b/media-video/setpwc/files/setpwc-1.3-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874918
+--- a/setpwc.c
++++ b/setpwc.c
+@@ -348,3 +348,3 @@
+ 
+-void query_pan_tilt_status(fd)
++void query_pan_tilt_status(int fd)
+ {
diff --git a/media-video/setpwc/setpwc-1.3.ebuild b/media-video/setpwc/setpwc-1.3.ebuild
index cbc20cad7175..74d9c738c038 100644
--- a/media-video/setpwc/setpwc-1.3.ebuild
+++ b/media-video/setpwc/setpwc-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,10 @@ KEYWORDS="amd64 ~arm ppc x86"
 
 DEPEND="sys-kernel/linux-headers"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index df23acc351cb..dc0a3d36e72b 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5d5bb3869ca5..a6c49aeca065 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 21 Nov 2022 00:10:03 +0000
+Mon, 21 Nov 2022 06:10:04 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 7fbad3389b2b..810801a42370 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-21T00:10:08Z
+TIMESTAMP 2022-11-21T06:10:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6weBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN7FkBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDEJw//antTEsVN3BJOvTwqVe7Pw0i/n9SwyIayfgi94vT8HtrhFbWN3KWjRKHR
-T30tOwiEKcqgNPpIqDvNTegB9cS9/pL+i/epeAgXq6F4AAQAT40QJJHhYIscu9n4
-rgXVVG7/bW55TjTaCa5u8lXadY99z3p4u5mxIJTqPblt/xUcIX/L9oR/PalmTHGQ
-18m4ZIq89cVGeJQHAJz2HafX8PiUclZmDBbM3hr6sQOHnDMwko2X5upyGcgGKoze
-JmveFF78ljkT9IqiC56psHfkxOgERN6gDx6ihrQhPn2VSej6aQuYnw91yggRcII/
-qW8jAe0iLwZvjkH70QCb15DPjJ5NiNxlLLNyf8nA1/nhTz7NQMKaTqV7yYVsqHf6
-lZ9Xuv4j8xduM0zHsXMpp/DJ6iEf9L7oSWbfdbArhnVG+VrybDCNeuKuJA3u+S3r
-60NLesTa1JhwnmjWgtMLui3DRDZs7NZOCWI4kgQxpxwltQYaRp5qZUsCIt7+54qg
-wmpjyhq17B89yGNive8/hmhjR1mRotLBeAndQzSPPOSxsZZVOy+HiwYm42HIefq1
-dcg+9VUoK2/vYroR8p6TBQwWiKCVtjVc99YiwmB2WyGqqjT53qlLHyEhcUiRCuL5
-UM5pPif85nO/ooJlETQTLFYbgM8DMx9AsEHyOGPmHe40rMfUIYU=
-=mgcR
+klAEyw/+Lej83p/kZBdZAv9p7ffNATLDsoKjyvEVQ4kjidUwn/i8ZKibZFxEi1xV
+BWM8aFiFQhTdz2zjoQVuTzG3FIWvpqy+pQlkQsL78FnGdSticbKaykOk/4zr38rA
+oPkCml6Ihyw09NTIdqXn7YV4OZSUwcf2/dx3kK3qXSokwyVWAn/Ruy15wsGd0oEW
+DCPUeHD6iVnhxSf1Q5xpUNFdg8nf1+fNqeDyqrh8SJuaTvN9VXJZm07O0iGN2qqM
+f6gYxWAaNTAstFZT0/46+RksDqVWp+hdqkrBK8wCsWOyF/l2KYk1hAJLsWPLRgLY
+QWXUjDmoc+4YAnGjR16t9idG36DeMyGOBqmcB8j+s9kVBASJXs4aZfykJJcFvR6p
+/JgiRjhhKIrtPaV2optjCDcsCqEPIM4yT5wg9zGkbHdlZbnsEJEDunITnDbLPIok
+JaEMbKljZYch/tDCh+M+q2avy3D0Bo85MjiQJdPgfdYuH7nt7j+dQVQ4uOtMdk1E
+L2d1qkxznVH3nAf4aTZVkUpGMuIopkxHIK100+I7dq8YMX+Z4vyxcXejpigx7vE6
+nWNUySwhMjYjHq81ub7n5e/5VSYaYgdCcz7wGUlN1Cdqs23+tl4C6/2+/8jRC2T4
+L4xHBDkXfrxb4JBGk/lK34WuI0RhRgjQEqxyewaTEK0pu+I6WUM=
+=3s1J
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index db7c646fbea7..a6c49aeca065 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 21 Nov 2022 00:10:04 +0000
+Mon, 21 Nov 2022 06:10:04 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a94283d1668d..ef32f8553352 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c81d598d0731..5d17ea71befa 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/a2ps-4.14-r8 b/metadata/md5-cache/app-text/a2ps-4.14-r8
index ee7d1950db4f..7c7c233db5f8 100644
--- a/metadata/md5-cache/app-text/a2ps-4.14-r8
+++ b/metadata/md5-cache/app-text/a2ps-4.14-r8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/a2ps/
 INHERIT=autotools elisp-common flag-o-matic
 IUSE=cjk emacs latex nls static-libs vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=app-text/ghostscript-gpl app-text/libpaper:= >=app-text/psutils-1.17 app-text/wdiff >=sys-apps/coreutils-6.10-r1 emacs? ( >=app-editors/emacs-23.1:* ) latex? ( virtual/latex-base ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz cjk? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=da7ecbf6d920be67a5b4d9fa0e587b22
+_md5_=52a212392ee4f244caf91cfd79f635ee
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a4b41ce44406..0aa6d8338985 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/pytest-bdd-6.0.1 b/metadata/md5-cache/dev-python/pytest-bdd-6.0.1
deleted file mode 100644
index 59ddce03be61..000000000000
--- a/metadata/md5-cache/dev-python/pytest-bdd-6.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=BDD library for the pytest runner
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pytest-bdd/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/glob2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/6.0.1.tar.gz -> pytest-bdd-6.0.1.gh.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aa7b731ddd0c56f32bdac2cbdaa77441
diff --git a/metadata/md5-cache/dev-python/pytest-bdd-6.1.1 b/metadata/md5-cache/dev-python/pytest-bdd-6.1.1
index fefaa27329cf..8e6bffc05fe9 100644
--- a/metadata/md5-cache/dev-python/pytest-bdd-6.1.1
+++ b/metadata/md5-cache/dev-python/pytest-bdd-6.1.1
@@ -1,11 +1,11 @@
-BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BDD library for the pytest runner
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-bdd/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/mako[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse_type[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/6.1.1.tar.gz -> pytest-bdd-6.1.1.gh.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=75dcda0fab8372ddbb2b951c48bcd31f
+_md5_=f7af6fa4842d6bd5acc3751a2a91bfb7
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index a8470f31af10..2c167a3ad20e 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/battalion-1.4b-r2 b/metadata/md5-cache/games-action/battalion-1.4b-r2
index cdf3eb74c65c..00bc58a93957 100644
--- a/metadata/md5-cache/games-action/battalion-1.4b-r2
+++ b/metadata/md5-cache/games-action/battalion-1.4b-r2
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare
-DEPEND=acct-group/gamestat virtual/glu virtual/opengl x11-libs/libX11
+DEPEND=acct-group/gamestat virtual/glu virtual/opengl x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=Be a rampaging monster and destroy the city
 EAPI=8
 HOMEPAGE=https://www.evl.uic.edu/aej/AndyBattalion.html
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat virtual/glu virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.evl.uic.edu/aej/BATTALION/battalion1.4b.tar.bz2 -> battalion1.4b-r1.tar.bz2 https://www.evl.uic.edu/aej/BATTALION/battalionSUN4.tar.gz
 _eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2d5b6a9e66b145783b936cd9f5cd29c4
+_md5_=056e8a23b8cbb1add27f5d0a6e9f8b06
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index fc36c963521a..ff64856b117e 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/grande-KXL-0.6-r2 b/metadata/md5-cache/games-arcade/grande-KXL-0.6-r3
index 28cb762242b9..8a55a5175248 100644
--- a/metadata/md5-cache/games-arcade/grande-KXL-0.6-r2
+++ b/metadata/md5-cache/games-arcade/grande-KXL-0.6-r3
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat dev-games/KXL media-fonts/font-adobe-100dpi media-fo
 SLOT=0
 SRC_URI=mirror://gentoo/grande-KXL-0.6.tar.gz https://dev.gentoo.org/~ionen/distfiles/grande-KXL.png
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2ab0dc3d85837ab496210dbaaa659461
+_md5_=f607575bfdea6a37fe5b0edb824316bb
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 3eb15bcb0a90..418eb7fb5a50 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/desmume-0.9.13 b/metadata/md5-cache/games-emulation/desmume-0.9.13-r1
index 37e7b0334fc9..e9042d7b09fd 100644
--- a/metadata/md5-cache/games-emulation/desmume-0.9.13
+++ b/metadata/md5-cache/games-emulation/desmume-0.9.13-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Nintendo DS emulator
 EAPI=8
 HOMEPAGE=https://desmume.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=meson xdg
+INHERIT=flag-o-matic meson xdg
 IUSE=gdb +gui openal wifi
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[X,opengl,sound,video] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= x11-libs/agg x11-libs/libX11 gui? ( media-libs/libglvnd[X] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 ) openal? ( media-libs/openal ) !openal? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=https://github.com/TASEmulators/desmume/releases/download/release_0_9_13/desmume-0.9.13.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f6dcd0e8747571b18441d4a926f36a7d
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2d2e27403e959827be15a83ea7f9ebd7
diff --git a/metadata/md5-cache/games-emulation/gngb-20060309-r1 b/metadata/md5-cache/games-emulation/gngb-20060309-r1
deleted file mode 100644
index 90eb7d84cb33..000000000000
--- a/metadata/md5-cache/games-emulation/gngb-20060309-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=media-libs/libsdl[sound,joystick,video] sys-libs/zlib app-arch/bzip2 opengl? ( virtual/opengl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Gameboy / Gameboy Color emulator
-EAPI=6
-HOMEPAGE=http://m.peponas.free.fr/gngb/
-INHERIT=autotools
-IUSE=opengl
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,joystick,video] sys-libs/zlib app-arch/bzip2 opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://m.peponas.free.fr/gngb/download/gngb-20060309.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f43ddc01ad1899d49718eceaec333475
diff --git a/metadata/md5-cache/games-emulation/gngb-20060309-r2 b/metadata/md5-cache/games-emulation/gngb-20060309-r2
new file mode 100644
index 000000000000..fd1fbad700b2
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/gngb-20060309-r2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=app-arch/bzip2:= media-libs/libsdl[sound,joystick,video] sys-libs/zlib:= opengl? ( media-libs/libglvnd[X] )
+DESCRIPTION=Gameboy / Gameboy Color emulator
+EAPI=8
+HOMEPAGE=http://m.peponas.free.fr/gngb/
+INHERIT=autotools flag-o-matic
+IUSE=opengl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= media-libs/libsdl[sound,joystick,video] sys-libs/zlib:= opengl? ( media-libs/libglvnd[X] )
+SLOT=0
+SRC_URI=http://m.peponas.free.fr/gngb/download/gngb-20060309.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=c6f828e2e5bca0eeb6edd9584059f655
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 4d7db8c35c36..f3f21f7c603b 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/xzip-1.8.2-r3 b/metadata/md5-cache/games-engines/xzip-1.8.2-r4
index 9c6b91c2eb81..ecff46e2a3e9 100644
--- a/metadata/md5-cache/games-engines/xzip-1.8.2-r3
+++ b/metadata/md5-cache/games-engines/xzip-1.8.2-r4
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.eblong.com/zarf/ftp/xzip182.tar.Z
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6f0011b3f866f60011537bb168acb241
+_md5_=af97fcd1eb4060af08fc45d652c0d6d6
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 10d31bd69713..2f8d43670f91 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/wavegain-1.3.1 b/metadata/md5-cache/media-sound/wavegain-1.3.1
deleted file mode 100644
index 0e031c09f95b..000000000000
--- a/metadata/md5-cache/media-sound/wavegain-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=configure install
-DESCRIPTION=ReplayGain for WAVE audio files
-EAPI=7
-HOMEPAGE=http://www.rarewares.org/files/others/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.rarewares.org/files/others/wavegain-1.3.1srcs.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ff337647a44505664607e0d45ccef93f
diff --git a/metadata/md5-cache/media-sound/wavegain-1.3.1-r1 b/metadata/md5-cache/media-sound/wavegain-1.3.1-r1
new file mode 100644
index 000000000000..6f5e5c45a5d4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/wavegain-1.3.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=configure install
+DESCRIPTION=ReplayGain for WAVE audio files
+EAPI=8
+HOMEPAGE=https://www.rarewares.org/files/others/
+INHERIT=flag-o-matic toolchain-funcs
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=https://www.rarewares.org/files/others/wavegain-1.3.1srcs.zip
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=459eff01fe64a0ba3fb8dbf0a5f02df4
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index fb675827dc35..438b6bd05cd5 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/setpwc-1.3 b/metadata/md5-cache/media-video/setpwc-1.3
index 7ca88af7b15c..997019d119e3 100644
--- a/metadata/md5-cache/media-video/setpwc-1.3
+++ b/metadata/md5-cache/media-video/setpwc-1.3
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.vanheusden.com/setpwc/setpwc-1.3.tgz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=24616dca8dd94ba32c08fc9ea5a507f7
+_md5_=942225026c8975c29466b01990793ef7
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index f550dd179295..de7b15bf136e 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/git-sources-6.1_rc6 b/metadata/md5-cache/sys-kernel/git-sources-6.1_rc6
new file mode 100644
index 000000000000..47f83513d221
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.1_rc6
@@ -0,0 +1,16 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.6-r4
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1_rc6
+SRC_URI=https://git.kernel.org/torvalds/p/v6.1-rc6/v6.0 -> patch-6.1-rc6.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	222472d400d477278b203edbf50c3b98	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=04b03ecba24933874b6d52da3c95bf6c
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index e3d3f9aeff7d..5423f7019b8e 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/wmstickynotes-0.7 b/metadata/md5-cache/x11-plugins/wmstickynotes-0.7
deleted file mode 100644
index 989ee4d071d5..000000000000
--- a/metadata/md5-cache/x11-plugins/wmstickynotes-0.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/gtk+:2
-DESCRIPTION=A dockapp for keeping small notes around on the desktop
-EAPI=8
-HOMEPAGE=https://sourceforge.net/projects/wmstickynotes/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/wmstickynotes/wmstickynotes-0.7.tar.gz
-_md5_=cf1b7f0482790b1ad5dedd299b9ec62e
diff --git a/metadata/md5-cache/x11-plugins/wmstickynotes-0.7-r1 b/metadata/md5-cache/x11-plugins/wmstickynotes-0.7-r1
new file mode 100644
index 000000000000..a351947537ad
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmstickynotes-0.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=A dockapp for keeping small notes around on the desktop
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/wmstickynotes/
+INHERIT=flag-o-matic
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://sourceforge/wmstickynotes/wmstickynotes-0.7.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9bb4b02ba864a968ec421b142be324d6
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 5a72eef275b8..a48aecc3dcf0 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14242 BLAKE2B 0b13e07c0ca6808e9c7be85e35e3626d23fb1edd8d346aa34174e8a381746d4e0f7912ec2d9e56b2d4902ad8f96df1d0254cb4a06e557821467698c6e21ff2dc SHA512 d20534cff591c706bc93a22aa0eaec857a25d9b1f2bef947d8f1649aabc1ad076864e257f96ed26e8b8a505641dba77565f5f275310a46ae6fc904842f6368b3
-TIMESTAMP 2022-11-21T00:10:08Z
+TIMESTAMP 2022-11-21T06:10:08Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN6weBfFIAAAAAALgAo
+iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmN7FkBfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArWg//fshy1ccJwB49SMoFMdRsq+FL6UkqAUmjD4bvC4YlNG2JI8ROgae8W/av
-BwTDDgUE/b4xdI2ZXbkpc9peEw5wwkGMh2lJbmfcMgH7lSw88hleVGeGxUe6rtHg
-eSVVEVdPhO0pm1W/IND4fMLDrsdkl7q+cp9E4jJE4x2LXU4f6MOzn7AhuR0I25a7
-FzaWMH8Ch0XOlbLJHU3KIhtMH3gjTCScdgLX9zV7ihJpAHPbJ+yJ0aTx/CBQrzV7
-+zpN0ywnznub+F6KS4SjCh6gAwIBtbj/dECyHqd1qW+/Hfo3Aex/3DdDtnCdftP8
-plMb5y7hYZ+fp6uqgNCLva/1+ULpspRKSHQdFF2Flm3ZuWmSijsXy1RSwZqxLBY7
-rg8HL41gC/OgypGZXRgYcXcpEQ2J/9bmjoCEE7s6iElvS0PQ7vLjAwjJfsJg8Fip
-yntwRQ9YBL1bDL7pYjGDPmWfnZv7M081y5E/OMywHtTflGrv7UEGYvzYJc/CS1wS
-Gg0ALsVtttl+vhG97TceGx7p4GoqvMgqWfDyHlUpA0YyjgHIxlMG9+i+5L9Lqh6E
-A/qycJU9YmrExzMzXozpKr5nTg7+DXUoGjX5o4IRJkEykB2+vjTMLmsXn6ylK6FL
-3qfVKVK1yOW+AriQeVCxFD4aFHg/8UyhCZgihcHWjUn5rxTrdSQ=
-=JuKk
+klDQ8g/4hMF+RNNLIy7IeguRPXLQxGj0hk6z3JKqvEVq3qQUyEtRsDw6pfBh1Ln0
+9TDRUVY2NJlYSsXRJfW6yqmSO4ZTaQ1NI9mwx80NwChosLryc85o/IDqTunrl3No
+p0Lhgx46HPed1mkA8OhH7dl/FQz4wax8hToomixQfiJmlOIJaA7Ad1NOgnr4GZYM
+W0MOlUM5ktZEETEYLrmTsyN580p6asPFDOQD3gYK5Bpjph+lItmcZoEIBmBU1V4E
+Bg5FyiAtzLM4KVxgJeHdPhhiZJanl2gcxLvadcMEeXMh5TDkEinAUw0wI0DPZFhM
+68JYnJKCjDmaBAEwMx0gtat/sw+61PxcrpE+L4FxsyVEcla397gU/FkL7ReUk/54
+7PO9w4Qb3f4/+RxPqAoDAQhhLce+S9SraZlfuF7rl5rQiWmCAQr8V2cCnaHrXqks
+k3AyxyYPK3PR/NT0EqTprDGkBgTVaAcIsJm5vYexelwastuL+jv8oMY8q4EvfxiK
+mT/GfxcKzimF0Xsl39E8zPzEGcTYa6raZtXiiwy4Zak3zuuI3ZXRfHWD32AoA3B1
+40nwkIb0j288Wt21zCzu4Wh2xYVdjbtDQkUh6yFH0p/Zsd24WikL7g3RU3IpQnIn
+C6UR4/5TguLHPbkkpmQ3paTGaYRIx8bhFin2xlH15fv0q0KSWQ==
+=NDGe
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index db7c646fbea7..a6c49aeca065 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 21 Nov 2022 00:10:04 +0000
+Mon, 21 Nov 2022 06:10:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 08a5c847897e..bf7e68734d68 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Nov 21 12:10:03 AM UTC 2022
+Mon Nov 21 06:10:04 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 18ce7195a66e..7d88922edf86 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 21 Nov 2022 00:15:01 +0000
+Mon, 21 Nov 2022 06:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 127baf306166..56ef692a0a4a 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-8a3ad37b11ea556a57e72c63ed45edb879fa5977 1668988557 2022-11-20T23:55:57+00:00
+d6ff3b9ae1e1c2ba78c71abed4354e6e42057221 1669009013 2022-11-21T05:36:53+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 737caf8a1c86..c462a55276e5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668989401 Mon 21 Nov 2022 12:10:01 AM UTC
+1669011001 Mon 21 Nov 2022 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5d5bb3869ca5..a6c49aeca065 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 21 Nov 2022 00:10:03 +0000
+Mon, 21 Nov 2022 06:10:04 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 956856699fe0..eaa50c6358cd 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 331f972d8ba9..472326f9fd82 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,18 @@
 
 #--- END OF EXAMPLES ---
 
+# Ionen Wolkens <ionen@gentoo.org> (2022-11-21)
+# Was added only for dev-python/pytest-bdd which no longer needs it.
+# If using, migrate to stdlib glob which supports `**` since python-3.5.
+# Removal: 2022-12-21.
+dev-python/glob2
+
+# David Seifert <soap@gentoo.org> (2022-11-21)
+# Release more than 30 years (!) old, K&R C, full of implicit function
+# declarations, EAPI 6, problematic license. Bug #729536, #854879, #870736.
+# Removal on 2022-12-21.
+app-text/agrep
+
 # Michał Górny <mgorny@gentoo.org> (2022-11-19)
 # Fails to build.  Last bumped in 2017.  Library with no revdeps.
 # Removal on 2022-12-19.  Bug #630396.
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7cdec2b9e68c..442851cbf055 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 0177f195a0e5..70f55fadc17f 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,9 +4,11 @@ DIST patch-6.1-rc2.patch 51039243 BLAKE2B 0f0727885c52a12e5eaf907d40752705a2dc8b
 DIST patch-6.1-rc3.patch 51538717 BLAKE2B 3dae85a6363655d534bd1f87eedc9711280484faec8787c89e7a61d54ac56aea7533e9f001a7e8838fe931ba0116d4d9cb0f574ce0c3a53877618dc8fecd47c4 SHA512 2f3f9f53de9d411882f44c740082bcafdb2cc0fe715022225e638b52a53970ddf88c869094bb3afd5ca556da45840fb91aa1e30ca348331ac412ecdee8defedc
 DIST patch-6.1-rc4.patch 51927243 BLAKE2B 168125d2afe15679f55f77bf2509bf38f1c20d5f742430febe0fa53c069b1460b81dca3eb4382ecf47450926bce9f033c1c2370709b93eb4da31ef87900161a0 SHA512 75e2dd8a3a587f9c9027e7d3b007de00e1d142c54405e94f2b36202b47624fbbc89c2a60d9c16f92ef16e317062c2af82356c888b35b1b5007756218dbce69ef
 DIST patch-6.1-rc5.patch 52243147 BLAKE2B 0bdc2ebcf322114ea05fb020ac5b8322bd61eb2b391b6cb27b14f2d6867089e921d02fdce8e54575e5b13832a6f3bec055adddda3d68fcf5b5ef3031a7815724 SHA512 2583fa29bbbdf1dd667843a816c58c0a6537038dc8cc66aa3509d34897f68bfe21f7107005db71c5eab5b9de034341bb00508bec89d562759baf5305c816877e
+DIST patch-6.1-rc6.patch 52490549 BLAKE2B 6719479fa42521d1247f14f9c807b1b79d380f67c3c34ad025d5ea98414aa76eac888543f71b0433b6abffdd3222ad57f95ff3a14625c57919f6058ef268a4e6 SHA512 4dbefa1a2d622c1b6427c349631b039e13da6b0a1c92711d930c5b5f58075970a40b6b4f7119a877888f06d6cd2f3155f19c839ab5d8b7980ce55a2b6b652cd9
 EBUILD git-sources-6.1_rc1.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 EBUILD git-sources-6.1_rc2.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 EBUILD git-sources-6.1_rc3.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 EBUILD git-sources-6.1_rc4.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 EBUILD git-sources-6.1_rc5.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
+EBUILD git-sources-6.1_rc6.ebuild 1191 BLAKE2B c5bb824a1d0b5bb9ef1d3a82fdea4ef8f7fdf3a44a5e7b8747f17f7d6929e44c7ba4e56d218344090d2107b45190a1e93fbd291949cd9adf6b18154fa12718ae SHA512 e8dc2cf31a00c73625453bf8a90f1ecd0786c5a4439158bca21097edde2bae0fb38d3f0ea51128c9aa169a95ad1035927356deee7c2623db82f0711b05d2d339
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.1_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.1_rc6.ebuild
new file mode 100644
index 000000000000..b91652186526
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.1_rc6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.0"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 9b2bb884fec9..1442b26ea2b7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmstickynotes/Manifest b/x11-plugins/wmstickynotes/Manifest
index fc0aaa77d594..9a5750723fbd 100644
--- a/x11-plugins/wmstickynotes/Manifest
+++ b/x11-plugins/wmstickynotes/Manifest
@@ -1,3 +1,4 @@
+AUX wmstickynotes-0.7-clang16.patch 192 BLAKE2B afa0ae1cc8ebb1a094b8e180e0059a0f2e8a154604ed952fb6248a04779dc92fa818c5608d56280d17204070864f36bb96cdd1fc114aa634409cbec7ee856423 SHA512 7db66b8e153ceb0b43631eafbafda57c864add8a9d930d0459c98d02ec723b011596adb25d7c117d78a19828e7783bd1486ef1c24116df85118f9df06574c486
 DIST wmstickynotes-0.7.tar.gz 121562 BLAKE2B b589f157d53791e3edbf409932616bcdc9d8915d6c2cce1d5901c04e73d76cffa5eb321c2f9b0a0ceecb8aeef3985637195d8a027687f0a94e6bd5544d56335c SHA512 986ca0bbd726488795559be9ca65390eb0d091834335d89f590cc67c40aeb14f2b48b7a61cf3170c4287a98ecf44f1a55d85b6b5d03d2d7df1cb6fe5b7ac3d0d
-EBUILD wmstickynotes-0.7.ebuild 391 BLAKE2B 5a402e0624b27e1c54b654aacd779fe0c71a853c856f134f419c3a7bce48addcbd5f981e2f4c01d24675c11cf52c73216fc83b2714581a2b6da85589caab5b6b SHA512 d8c7fa39645383365a649064e26ed164632ec0f235a452c73d9ea3c354fbfdf8f925af173182e12bb5a91e79a50fe0b86c89d06679a7134c6003797934ddea53
+EBUILD wmstickynotes-0.7-r1.ebuild 590 BLAKE2B d513f6bb018e32281721f3a18f52b5b5c04e60b2ef268de1e0f80fc76d4fe185d8d0a18ec96fe07d03be66d4522d00b3814b5bc0129aaaa0b7ab75e83c1cc66b SHA512 f59c75685d00eeef0cb5e869e90a08a5c67361bfa0c3acdaa55e8118817561e1792746685c6330c6deb1f4862da4494db417ffcaaedf35baf1173eaea5ef4442
 MISC metadata.xml 251 BLAKE2B 82b714e8cad00786feeb0767f01f0336ce8b181c4b94d8b3006b9955ed1af6524f23e0180349e21195ee7b77ec5e3594a50dd450447ebf05840db9e43db9fe0b SHA512 12e65b976f16501126ac85035ee1ed2d4e7adcfa955eabadfcfffbb95313125d3f5a200c003d1426615a6a9765c49f563308ca5bf479476226e71370886342f9
diff --git a/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch
new file mode 100644
index 000000000000..7674dcfd4984
--- /dev/null
+++ b/x11-plugins/wmstickynotes/files/wmstickynotes-0.7-clang16.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/874927
+--- a/wmstickynotes.h
++++ b/wmstickynotes.h
+@@ -34,3 +34,3 @@
+ 
+-const num_color_schemes = 8;
++const int num_color_schemes = 8;
+ ColorScheme color_schemes[] = {
diff --git a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild
index 8b8830387ff3..3058805ac1e9 100644
--- a/x11-plugins/wmstickynotes/wmstickynotes-0.7.ebuild
+++ b/x11-plugins/wmstickynotes/wmstickynotes-0.7-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit flag-o-matic
+
 DESCRIPTION="A dockapp for keeping small notes around on the desktop"
 HOMEPAGE="https://sourceforge.net/projects/wmstickynotes/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,5 +13,20 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-DEPEND="x11-libs/gtk+:2"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_configure() {
+	append-cppflags -D_GNU_SOURCE #874927
+
+	default
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-11-21 07:03:54 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-21 07:03:54 +0000
commit	1ad2c51f9cc380c164b03ed03acda1c3fcc0a476 (patch)
tree	dd39d93cbea55db38069a7fed0a1c8667b7d88b3
parent	d32022e7301aef2b3f52f6b7a3de81c6e03ffcaf (diff)