gentoo auto-resync : 16:08:2022 - 02:29:20

22 files changed, 112 insertions, 32 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a0ffa860718a..9da6df2e2ca8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 9d3c17194066..f4fb4d0b3b9c 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -2,6 +2,7 @@ AUX capstone-4.0.2-libsuffix.patch 347 BLAKE2B 5478a08d072cff0873c3410ce99dcf20c
 AUX capstone-5.0_rc2-pkgconfig.patch 464 BLAKE2B 68727cd48eb79d43417df46312d8def40307e4120becd4e89edb88c367c02190e3174fc715a3bd593ea18a5f6b1592e958c7fa3643c164d69f3b9be882911d1d SHA512 cc6588b281257644679004baea4c722a4be88cd2510b632585036017fb8e6eddd5fab3a469c1583d0d6fee1fd1e6490d3773c7de84389f9ea3d72fddfd5add59
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c SHA512 fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
-EBUILD capstone-4.0.2-r2.ebuild 1532 BLAKE2B 5a06905077ef4a45d3a9a92cb5e6d99eb24f85505f5b66b8c118b312cce25d8f763d8dc7706d8aa3059683f58bc3e0e4726ce7a390094ce88a0ef271d24cb16a SHA512 c0e10d2e4f3b6e87f42d6cb938e6d0c004879276844e7be3856d5688221d0602f7514f2496997a8799c05200599c3e276d8dbecc9d6aeb3b31d69cd411ab89e2
-EBUILD capstone-5.0_rc2-r1.ebuild 1457 BLAKE2B 37769d1d00ef8fc1bcfaae7017d26410f19ef0ef8df3a7393e085e074f34904b6b277d277b446ddc7051bd87489aee0778fa4a801f263c704474dd3f69acd531 SHA512 023dacbdc093592d18dbffd388e47b2c71f735108e0013cbd7bb216cf183d8dc4b220ede87f15ea293af7cfbe1b3c3c763d288a2bbb343406b39e9a89feb24b5
+EBUILD capstone-4.0.2-r2.ebuild 1535 BLAKE2B 15f3ca620f06cf18d35a0c18324dc0b61297e5479e408a7f38d42eb1b69ce7f97357057d18a9dcb970bf4b61a73c4564e4d90f5a07d22462ee1860d476b1139c SHA512 6a2cd3383a7f58183bb1fc621c756e4b78f4c3f70bb355e98339b4ffc7dd03c7ac7850be8db376fd00707403bfe4a27241d7c7d4a21eaca33be9e7f0df02de30
+EBUILD capstone-5.0_rc2-r1.ebuild 1471 BLAKE2B 2d3cc1c286bd5173493b197e687a2067210609d15a12099ce49850366c20fb78847b90326b21500303141c2d697ce56a75e652e84af5a420cfc49f11f14caa37 SHA512 301f874cdfedd391f425c066fceae7d607f38bcbd3a3be283fb706e4e0da9861095421275ba5585db7d9d3127f7b7f4e14f9809754e56935a3d903affec239b8
+EBUILD capstone-9999.ebuild 1568 BLAKE2B f5dde9abc087427f4462f82075651dedc26931d16864bec80830c70d7423663b9b9abbbc9f67980b1b08555fb61b877b05c9612d200112b32ace2857ba6f9066 SHA512 da214669d779c3500d7eccbef4cab3c23757ce6cc155d9e45dbc644474677c9cd5946adde6b03306be7872f9037d45489e0130e0c92b40db5ed14f86ec77612b
 MISC metadata.xml 484 BLAKE2B 32c39bf06443ce4ca18191a4c9626cf517d5bd4f837c179e6186a68a0053217bf41d61d2c4d46c9792b1974879d22b36e4a02fa461a1b085acf5c4406bde4891 SHA512 f06dcd3133982f72cf21c5bb3d9a34207d7083233b5e70856f6a1dab60ef361cf1432659af30ea6b90fcb38cfdaec49f0792623ef841e136bc33cb5e1c40d1cf
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 9ce37b266b5f..b604ecec3a89 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 174d710dac2a..70a870cb34e7 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
@@ -31,8 +31,10 @@ PATCHES=(
 	"${FILESDIR}"/${P}-pkgconfig.patch
 )
 
-# Upstream doesn't flag release candidates (bug 858350)
-QA_PKGCONFIG_VERSION=""
+if [[ ${PV} == *_rc* ]]; then
+	# Upstream doesn't flag release candidates (bug 858350)
+	QA_PKGCONFIG_VERSION=""
+fi
 
 wrap_python() {
 	local phase=$1
@@ -40,10 +42,8 @@ wrap_python() {
 
 	if use python; then
 		pushd bindings/python >/dev/null || die
-		echo distutils-r1_${phase} "$@"
-		pwd
 		distutils-r1_${phase} "$@"
-		popd >/dev/null
+		popd >/dev/null || die
 	fi
 }
 
diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild
new file mode 100644
index 000000000000..762e910dbcef
--- /dev/null
+++ b/dev-libs/capstone/capstone-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git"
+	EGIT_REPO_BRANCH="next"
+else
+	SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+if [[ ${PV} == *_rc* ]]; then
+	# Upstream doesn't flag release candidates (bug 858350)
+	QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+	local phase=$1
+	shift
+
+	if use python; then
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${phase} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	tc-export RANLIB
+	cmake_src_prepare
+
+	wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+	)
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_test() {
+	cmake_src_test
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 3be66fe4a07a..dec2226d9593 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -5,6 +5,6 @@ DIST gjs-1.72.1.tar.xz 620248 BLAKE2B 945b988fdb8c9fc01ec73c8f10b7e5ba9db3ee6dab
 DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B ba36f6e0485dc507cba57a163eb835d5857e00e6f9dc46e6659bdd4e3b35965f10d8808c3a0220e7369f29c3c0552351ebdff4d590932bf916a11b2ae26ab8bf SHA512 d2be5b242e3249e7a718f7ea595ab3b44a83645f553d7ad42cc5a2b766b96a335b86f182a718fc1544e0817ade4b2d6229a0b0a41f9c4ab5f5ab0af49fc96bde
 EBUILD gjs-1.72.0.ebuild 1885 BLAKE2B 472680725a8ac3fc8f95831135755ff14a111b4491ceada68851fe8754b5e380308524d5d1b5760581cafb2e827a2a74ea449f5d55526d4515ce8358b0e479ea SHA512 b30afd4b9b05e09b4e864f70accc355bfc0fde823cd4cc41decf88732c5a06679167187de2f55df4fbca958367f8c399e5689926c5bdf35e7edd645be6bb5d25
-EBUILD gjs-1.72.1.ebuild 1926 BLAKE2B c6516dfeebbd96750d61349c81c7b6c4576a005c9b804d8d0f0374e72bae08d8b14123ed79817402c883406147ffb2c3c38f28b6ffde38a168ec9501b4c82bd0 SHA512 7bf0f50f97d5379aba02b764210a2394dc4a279c327002e7470cd59f867a9c44de3e26633e49c60d6eb7370dcb5dd16363753d063b712bae612271c3f5bbbaf3
+EBUILD gjs-1.72.1.ebuild 1925 BLAKE2B cb5519e7e59c873f00cd8a76467121c06aa61901f148e88bbfad3318062cf61c42175e21c0ec582d2bd7b8b20c5e94069c0558165698e7f7457c8b0eaa1f1fa3 SHA512 e42397dd717a6c59cdf943447bc66c3e9e2c2afb3e9f2b39a18900fdffec6e596c42c55d10ca26d6f0f16c9fc1b07655e5c61d2c5dcce44e76d2b90bee2fd4e3
 EBUILD gjs-1.72.2.ebuild 1930 BLAKE2B cfe059849d7e42ef0a43777c16bed4edb335a0039fc781da5e3b2260512acc3019f088772c26ec8b05c5a0134e949e30d02cdb9db686ef3f5600aa593bff558b SHA512 21cc6ba7bfddd93792fc0b3c5ab2403612aa704efc18d5518e71aa6c59efa015225e5f36f6004e9636b24ac674aac6ff65761464c78d64e59fd247fe1c74d861
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/gjs-1.72.1.ebuild b/dev-libs/gjs/gjs-1.72.1.ebuild
index 87ea30c49dca..cc09c1592110 100644
--- a/dev-libs/gjs/gjs-1.72.1.ebuild
+++ b/dev-libs/gjs/gjs-1.72.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 2a848d68f5c7..6a4e4e98ed26 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638
 EBUILD glib-2.72.2.ebuild 10244 BLAKE2B 3f37fd728f89fabc8bba3a09946a069cf3220d14637089300cac575a1fafc667d9e04a4592552db64db2144c80f9ae697f0597a5110175cdb0fb3c74e95d71e2 SHA512 ad314b8967042ad94110d0c582bb08bdb4df84dbef60f6184223604abdaf311fe1eb056103df0ec19d7fda010b8e90f2054df86ca817f451e0dc6e6b695a530f
-EBUILD glib-2.72.3.ebuild 10247 BLAKE2B 81a9eff4e405168370feb79168d6eb191f81839c6e44ce7a48a5ecd6e9e814f11f39ce911f2b97e3b5b51b3eef84c8b6b9bed8595f0e969a8f9a1a7bca9a1566 SHA512 819885f17b156fd94a27d6da6697bf36aa8c40148f7c334c1d68d0f768e7647226c6c653869da5ba2319c90125481dbeb16ea78e00878eb292fd9c6f953d219d
+EBUILD glib-2.72.3.ebuild 10245 BLAKE2B 0cec2e45949d0ea02dc71e7dba0bdc6c250ee54bb90d5a8d39df6790e1b05b5c5d51d344b07c92ed97e47ff0665768a56da66c0417cfb2d600e2a0849049805a SHA512 2d1d54ea54ba079d54cf0dcf1a3b54612a9045a21f8fe4f35075e3a9ca365f0b0251aa61bdec0432046cca01d5ea0c45c81e8f51896c6ce4d57209199debdf40
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.3.ebuild b/dev-libs/glib/glib-2.72.3.ebuild
index 220ea65f564d..3b523026c71b 100644
--- a/dev-libs/glib/glib-2.72.3.ebuild
+++ b/dev-libs/glib/glib-2.72.3.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index cacd13fdd386..280d9b936806 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,4 +1,4 @@
 DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
-EBUILD json-c-0.16-r1.ebuild 1119 BLAKE2B eae23596311f9f8900fd1f5540da7fcdf4d8ca6237750a1a5d5e765de2ae55efd9ea2fce1e8a7cc24e7f573f546f7007b24b1b036348b4c394a1215360966052 SHA512 4cd3837d0e275240de2cbb3216f75ccc2c8f4c3174505c53615636f1ac86da27b752c4ea21bffc45a3d61fc3dadcd9240461c69b367a7428bbc2467033199855
-EBUILD json-c-9999.ebuild 1039 BLAKE2B 3da4e08a2ba828fada531434ed0062b0320037448260864f5e666a6830c5ee47aa596d6f036f6beaad9f87f2934952fd4d7636c72e9bbfe8ef9bddc17c58a5c6 SHA512 f62462771eaecfbab8cc9790a09c7ea1c848a507f8612f9bc87acdd4a93b0673ece152297071ab47c8877d98ce2b2e3b6bb7a65c9227c9fda838551488b56e88
+EBUILD json-c-0.16-r1.ebuild 1100 BLAKE2B a634088e11831134506d38710aa838e610b7bd7a283643b473ef5215ae5f7bf847d364b68a6f384b64a7fbc22f3695226b3841b9cc51e6a140395eccab067625 SHA512 3453eac9480038aaa8248a9070fc11768adc12976f1ba40b9879abe25a71368e22c1fcc8534a74c28f18d2f814639b3d3f22f75f44630ffc65a13516ca430144
+EBUILD json-c-9999.ebuild 1020 BLAKE2B 5028540a819ae30613bb433839b4a9c87c4f12a2d83effa5f27fc5363a8d18d52bfda82c54f8e2802a8c1e6fd0fa8d43c43b5fdc1e7cb17d390d1f9f7ebbca32 SHA512 d63d5c212cc0136c7ad87a2a280f5caafb76402ea0d5c744d4a486ca775c7565a4fd90bfb3c7dc73bcac368ddcfb15f4498b09b66804c35d45490b78fe4091e7
 MISC metadata.xml 1011 BLAKE2B d9f64f6e06a3b1a5bb315e35590426e9e87d777bf2fe73a7f8c57e6730ce99236d071d7d9ddf190e654e39e91d4134fdd07689afa958d6aec69dc5a787e95bf8 SHA512 731afa46afd8fdd519425c1a58f791f4d999333e726426770a0f37e552d640d4a198f6b2eb859dca3c4aca21f3e1fc8ad147de0e07efcede14b5d791b66e4e72
diff --git a/dev-libs/json-c/json-c-0.16-r1.ebuild b/dev-libs/json-c/json-c-0.16-r1.ebuild
index 632bded1ad5b..897ab5dfeac0 100644
--- a/dev-libs/json-c/json-c-0.16-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.16-r1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="A JSON implementation in C"
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index db97175c5f3e..45ad70272198 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib git-r3
 
 DESCRIPTION="A JSON implementation in C"
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index fbd07197eeac..85f7c3dfaa04 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -12,6 +12,6 @@ EBUILD libfmt-8.0.0-r1.ebuild 837 BLAKE2B 40ccd08531ed4834cd9b5489a623775a7770e2
 EBUILD libfmt-8.0.1-r1.ebuild 778 BLAKE2B 6467a26d53e62b11869999f3fbe76c74e1c670c0b0e6103f522a093a163de1f11de0e9c89095784df4ab821beb9dc700398601c6983860ae048db329faaee343 SHA512 81167bd950c09b1113360df5058f21dcfb4223fa4b5a556bfcd716a7e545f70ed9264a52281172778ef8cf6221d08bcf353ca746231d0042c0dc512c93d2c183
 EBUILD libfmt-8.1.1-r1.ebuild 836 BLAKE2B 6936287dfea32391f430daa764b29103bdc3102f78eea596a8a9d346a5c596bf428d6fa84e1ef4c859b3842d7421abdacc453467c7c999a96392eae543d1dbb4 SHA512 f209f395a764bdb90f701f242e9e68de5b15f50c45dc05dff531f3ecc5952c5d77e24261d7a6be2b0d0f0b9558eadeb12fcf5e84a8e69577065f7c12af56923c
 EBUILD libfmt-8.1.1.ebuild 784 BLAKE2B a4f6a82298967ee7fd4cde9ecabdf910bc4f1ca6bae4667b15f86b170264928772ddd8097afedf69ef0b76e3281f77e395e061b7bcab60881eca9d78ad67cff7 SHA512 3756c94a13bf6a60a0b9dc66a7853de1694b16b5472f18a4f89c2fee17e0553c8b0f764b5294056281b1e9cc52369a1259d55d9e59f15de7feb84c63b10989bc
-EBUILD libfmt-9.0.0.ebuild 784 BLAKE2B e7ab665bec946eb315275d409b9cc85465067017fcc3cb2c3b679fd367c5fb91967841e6861caee7f2417af8725b1498eda4eaf0dd305bc37dc259b03718234b SHA512 70c66486fdefa9ebc4a96dd934c594d5b572f9d0c99fa7dcb3de9a794837d4165df8f2fe0bfaaa24b874e554a0d0bfdf094146476442f4413849ecc64aa16352
-EBUILD libfmt-9999.ebuild 784 BLAKE2B e7ab665bec946eb315275d409b9cc85465067017fcc3cb2c3b679fd367c5fb91967841e6861caee7f2417af8725b1498eda4eaf0dd305bc37dc259b03718234b SHA512 70c66486fdefa9ebc4a96dd934c594d5b572f9d0c99fa7dcb3de9a794837d4165df8f2fe0bfaaa24b874e554a0d0bfdf094146476442f4413849ecc64aa16352
+EBUILD libfmt-9.0.0.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
+EBUILD libfmt-9999.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/libfmt-9.0.0.ebuild b/dev-libs/libfmt/libfmt-9.0.0.ebuild
index e50165b5c1b6..d61928901158 100644
--- a/dev-libs/libfmt/libfmt-9.0.0.ebuild
+++ b/dev-libs/libfmt/libfmt-9.0.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index e50165b5c1b6..d61928901158 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index a4af3a8b3993..896dd61d473b 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -2,6 +2,6 @@ DIST opencl-icd-loader-2021.06.30.tar.gz 81832 BLAKE2B de36c69a46582a468594dd619
 DIST opencl-icd-loader-2022.01.04.tar.gz 81969 BLAKE2B 20018654ae1e9566d806f4d1de64301e0f023ffad2d432c852d4dcf7e323c9c1d60f2aa49a1290cc1263e0e9386b7b0ae4095341f9aaffd6a27edf53b1d1b49e SHA512 060769ed8c84d906b2feacb4be5402c67b5cd561dc2334b384a731e66f301840ad2fc2ed143d32cfeab246d91a6c1f5377b6c9db4d8fc0571a90838c575aca01
 DIST opencl-icd-loader-2022.05.18.tar.gz 86968 BLAKE2B 24931d9f59e885ea5673c774c30632735392a9994545d87737ac392566af991385f25a5b71a8f79b4dd271c6675667088123d25c015fbc843378641f19791ffa SHA512 a02cfef224f552294f029ad5ffda8901cc486cedaab8e7b47723eec59d215488bce4d255bd6350980e8fbcf7f71c73939b10ebb2b7cfd51c5b8051079e2b3af7
 EBUILD opencl-icd-loader-2021.06.30.ebuild 894 BLAKE2B 46bf167e1bfcd2fea1bf44fac0d38a775faa61f2ad39d7f7a197daf57da981db4d026715a5d0847986aa5f7bcb3af30c16ce36b8ca433a15e3dbef1d45cce48c SHA512 72d031f344ecfa5ffaa0aac118bbae6bfece8aa83321363bb81a94b617349a879d24aa17519b8d37d893bc7dc56dd78fcb018035c66ee84479590ff453e18e4c
-EBUILD opencl-icd-loader-2022.01.04.ebuild 893 BLAKE2B 7939c4ac7291afae8e3085015043b91838642c5d570ba57782170a4baf2a4236178ec8c0a8ae377f6abe6d7aa29fd6649d002fb556a65d7c62952eac1c3b1cb4 SHA512 0604cfcd8306e52d9e51410ea0cdd99018cbf81998e7bf04613a982804232435e7f770240aa08c3d5d1c12f480b0bda685f7394dfe5fac5d33abca5c7b54a47f
-EBUILD opencl-icd-loader-2022.05.18.ebuild 891 BLAKE2B 932a62970522c0f4bf4a0c193fce9e8c6abc76dc9be95b9a33227a829fd6cf538c46d28101bdba69a3483bb03e37b6d37758ff1f48700ce0596b598e0d5cbafb SHA512 a98b6d3d4c7b6f5b92ab36079d46d4aee8d4885246a713488007f119b6e9d41c1b4dd6ccb7743572d1251402ec60a755a8c82ed534ac63ef1e8f6adaa3e04628
+EBUILD opencl-icd-loader-2022.01.04.ebuild 874 BLAKE2B 49e153c18b42683f6a411031674f9901e6b4b06c99dee468acbb1e4a4fafcc46d60a7cd916af33d73d0ca4181618ee80d6cdd5ef1807b3abbde9215d41cdfa05 SHA512 909b7a861c3c30074bc2a740138ff986e6d9ced5a2ab06259d80b796d058f7050c559747fb39a6668fdbb5fae99fa8e9b264a73149081a4a85b61d45fba8774a
+EBUILD opencl-icd-loader-2022.05.18.ebuild 872 BLAKE2B f6260f1402ad6b0c6e4fc8f080a6c59d46f3d7f2a5a2819ead1b4385579e67be8e9ede8648bf8a0125653e846dd6a713710ab44a4f9e04d5409c18b31cbae427 SHA512 a08159be3e0df31966300d1bc90e76bdff8a441f85f57f07c469bde9994585930e42ae6c7e995532e1a08127314940526f87467bcc368f181e9467841367143a
 MISC metadata.xml 341 BLAKE2B b49a18b36fbbf0c978ad2445ee4688f32cafd66001f04e02256a420b9dd1e808f85c32e43adb15e5814957f5273a135f82c5fdfe37baf7e6fa73abe2c8fcd990 SHA512 5dcf111b1e5ec3e7532258ed2e29946cab993051193bec1413096b52148117c935b028e071c501863620c4a51e81aee333b9e4375caa14fdab3701524da99268
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
index 639f6fb14035..4ae2ca46c9e0 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.01.04.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 MY_PN="OpenCL-ICD-Loader"
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
index c01962c0240a..0799e46d6593 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2022.05.18.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 MY_PN="OpenCL-ICD-Loader"
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index c12da7150c74..ec1051097ee3 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
 DIST wayland-protocols-1.26.tar.xz 81028 BLAKE2B 0813b8117c48b965560c3f112f67fa209f29b0c40fab2b46f46ccae227d68902277cce06281a6bd938fb3c2186e0cf4ea3670ed6d3b48b51ed655012bb1452ce SHA512 fa9c3963b548197461c8c0b9e16ebbf9cfa5b60053fc17f51b41e63a55b8c5420dd7e42313f93946b438ab47f04e1cd17bc92aae9e1074b47177dc7ce7042167
 EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
-EBUILD wayland-protocols-1.26.ebuild 758 BLAKE2B d76d108a6035bb09f6f3b8c90a13da58e7c9a5589cadc7ccc5c7e17b1d0a387f77378ec2a38a37bec8808c2e658615325ee181bad3ef29e10bca32bc19ef4f3d SHA512 297fc33e6fe49d9beefd8c0cb37c19d1ccfd95de455ab93b4950f51253f3e8ab905ecbea5d99fdc4f058ccd0fc517a5ff16b2b6ee96d0138a3d648a9bb8451de
+EBUILD wayland-protocols-1.26.ebuild 756 BLAKE2B 394be811033ced7ba23916139ee76904d596c52b12981776875894d70ccada56aba211bcdc61f000e3f032b58cda268f47749f843273fc99ce5ced257d7e2f23 SHA512 af9500678d7931c52355fc1b5d53bb8dd0c17fbd9f94b832f86cba696f7160511f64fda4330bba33032f97a6904a37b71f56689eb966be91e9aee277657a934c
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
index f4cd12f8845d..dd41e6e15d91 100644
--- a/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.26.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index e622797e4a43..fbf503588662 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 DIST wayland-1.21.0.tar.xz 225936 BLAKE2B 2b43eb1517d476bb2b4daed1083373655b57d047968fdb93dbbbbe4235af12e25557627e30b5c3d2575bac4beaf1e0a0b8ef10a3c673538d9097501f33c05836 SHA512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3
 EBUILD wayland-1.20.0.ebuild 1516 BLAKE2B 1a602cda157f1184410d3d1bb71969f182ce9098e9ea0c9be023c1cf158850bd2b9fa3958caa7f3f5fd3974697e408425abe65c1a34d7fc8a826e21e3411325f SHA512 8f2522a515137cab3c4682b136b5a733ef155db57f88e49e4ccb6cfd79911f57173df94d2233ca8a9d9cfe94ad4f6f5ef243d3586345dc9b8e5856409717dfc4
-EBUILD wayland-1.21.0.ebuild 1481 BLAKE2B 209a57c04eb862e0c4a723eb1955c8e05213a3f3fa3f0ec4b31b09a3b0a8d461f2d9e8e8a54635ece03f2c900497f255209183534ff6d679f8428b62a8c7f620 SHA512 0ac21e601cbcf3de0910bd57127b3f51ae1b59cf52168d543ef071bcaa7730b91e335d3be79e45d10a1781f8edf0a0aff175b5d5671c3319e9f87131bd4215ce
+EBUILD wayland-1.21.0.ebuild 1479 BLAKE2B 153f9ad259224626e09c1ea78719131006ec77d352a5c20f957505e700f8a5ceb455f0e260bebb42825dede527615a779b3ae6fa554ea69048de687d6e7af428 SHA512 ac4f3986d48384e01ae4109bcfee2a5df1bfc84c1788bafb2b35f6c2330aeead1e73487eb5240f35a5bf2016d84fdf461e55631c5dd6037e7d5de4073ca54634
 EBUILD wayland-9999.ebuild 1485 BLAKE2B 8e82cc08d4efab01be9e60daa08f568c9c2760cd5247f66ac2aac0886ec0dcb3b9d5cc262ed7612e08c77f97c08371b454a35f2af693eb6a8cc88a19c23575d0 SHA512 fbb427c35c1e5df874e99391438babcca5c943b548dfc8c4380e694979833045a94be367d920d696c9e5b332171351e2ff298214e7e82c0c4bbc42a669ca9f12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland/wayland-1.21.0.ebuild b/dev-libs/wayland/wayland-1.21.0.ebuild
index d1fb659d7c5c..9918cd49a51e 100644
--- a/dev-libs/wayland/wayland-1.21.0.ebuild
+++ b/dev-libs/wayland/wayland-1.21.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 inherit meson-multilib