gentoo auto-resync : 03:12:2022 - 14:59:58

23 files changed, 381 insertions, 433 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 71624a90752e..33d6d4dd2256 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 74bf1d72a407..b377ec24acab 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -5,6 +5,6 @@ DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0e
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.7-r1.ebuild 1548 BLAKE2B cbfd522b33a1444ed0107ce67ed93bdb52d3c08e4759f30a0f29cf0ddb64aaf11e439fc216c0127322e5af2c4d1860019fdb6c38f069c9ffc682815be8deb600 SHA512 5ac04d835b9637569755fe65e4a918820c4d55b08c6eb6a6379aa5eaa1c26cedf8e533cc60090e19b8adc2358a54fec3673d77057b5f65b30be7cdbe99a03cb0
-EBUILD colm-0.14.7-r2.ebuild 1621 BLAKE2B f6fdbc42fab271e3c1257698cdf39cfe033540641b7d4d518a1cfd0bad93579a0bc4f46705deacc8cfe14b5b561b32b7c4d969f42e5b37688f07340d47bcd0db SHA512 54b7788d40e4ec0566e6e288e606311c00a2deacea55ecb42f91e81b5e3e567acf3b5141a8772f4f5117a225077b6738b566fdbcdf707970b7fc1ade5b15ed45
+EBUILD colm-0.14.7-r2.ebuild 1626 BLAKE2B bec293a6d21aebedb9e9152d707f5773ccc7cf6aa840b19a0d3da1d3ec9a5fb0c136f92f880742dc0bc99aaf779d197b492aaa9e2792ecbf2d65a158fcd8649a SHA512 9ec8817ece6986c65092e8d5336b73abbfa9267141afd2a0672cc4804e980b14b7e821e665fc9f05c4f77f67180aa47b0fb7e37c27382bcb520df61573d94dbc
 EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r2.ebuild b/dev-util/colm/colm-0.14.7-r2.ebuild
index 6b8a42904485..23a2f43b338a 100644
--- a/dev-util/colm/colm-0.14.7-r2.ebuild
+++ b/dev-util/colm/colm-0.14.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f9a55e99cf71..ef486bb589a7 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,7 @@
 DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
 DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288ae6e741653f8194a2d3d45e30b5826ca3d21a37b5db3867c73816e862f1d4593fe7a77487736f8a6e5f2b15057f2 SHA512 1e8a143006c4e734cf30d4110241ed164c3ee893801efa2a7b81a917146a0643dd8b38af0cac937847506a4338d59f4bb03211179742bb076fc4d4dd5f7cb585
+DIST diffoscope-228.tar.gz 3164190 BLAKE2B 21e75cb8e297540b149f22c52949d33a2e6ddd8c0fa8641e5d8b0c20045f1a7f6638b6b844631c2a5353cd23dc4d8447fadd9b8b3f5cd87fa33eb4b85abe3e2b SHA512 5ea3f0dfa17d2e17167241f9388a6fba919deec4c26a39e238fc282b0011f30e77b4daf27c0b076eadcc13ca51eb408eba983ea427adbaee3233db222b60948a
 EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
 EBUILD diffoscope-227.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
+EBUILD diffoscope-228.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-228.ebuild b/dev-util/diffoscope/diffoscope-228.ebuild
new file mode 100644
index 000000000000..e7f6e7cb72c0
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-228.ebuild
@@ -0,0 +1,120 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/tlsh[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence of filemagic's magic.py breaks imports
+# of dev-python/python-magic: bug #716482
+RDEPEND+=" !dev-python/filemagic"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="
+	test? (
+		app-text/docx2txt
+		app-text/html2text
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	tests/comparators/test_gif.py::test_has_visuals
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+
+	# Fails on ZFS
+	tests/test_main.py::test_non_unicode_filename
+
+	# Fails on (unreleased) LLVM 16 with minor difference
+	tests/comparators/test_macho.py::test_llvm_diff
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 49952c682a9d..68d7ceace9b0 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-22.04.3.tar.xz 1081120 BLAKE2B 252aecf224ac8059b0b24042b0d3d8a369125e3cf881aabda10fc999348104db9bdb23fadf08115281ae6332b8c2bc068e75078e63d761fb495d3808c879bfb7 SHA512 95fd3c3d6dc92351eaf470d4047d77622eae9629e7010c52b01f5b2b96c710664e1d8b32082f70942bd7f30d2161e1f61d596f62de36b38a173cf60594d277b8
 DIST kdev-php-22.08.3.tar.xz 1081608 BLAKE2B 8456d92f4d0092e4cb488400834d99d64c9034f979881fe8abd92cf6f9f8d920a34e5113ee5241aefbb5a9c6439077a1e648f1a6727cae5b4c9a89c4c3dfecc0 SHA512 c12ae5fead616f55a16f85cbf5c7fab6c39b89a14cd947fef1756c616690a92824e1cfa19428650d02ef3432e5618e81850bd635597451128981476a16f17218
-EBUILD kdevelop-php-22.04.3.ebuild 1222 BLAKE2B 47c481c8bd6f6ddc0353614925d1ee42b16cefd75bd3f62c0bef73f45e52df912bccf192a975cc70e6edc0c8b000d42cbc5c182f57b74d89df7e615abd28af22 SHA512 a048b5251f6e2a9751102a85c5979efc3e9235aeaeca7c6d653d21aeb7c2d439f610cd5a7f11eaea52f6d45a79ca6ab5a9d153b15e3f0d83dd3ea4c3c75180d5
 EBUILD kdevelop-php-22.08.3.ebuild 1222 BLAKE2B ab2d9383c00f792416c68fe5c8cb667842708b2dda41e3cbae2c7b2dccbd4a297e238ba6e8cd4ff47584725867a0ed439c509ffeba1c02817d5486b3a532198c SHA512 71b76c6025a79bb02cb5917a817806ed0aafcae6708ec39c9ec3168adac7d2fe7022149e7b1b7b75594f2a76cf3c006a5610fb88c47265538cdaafe72ea1a195
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
deleted file mode 100644
index 9400448210d3..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-22.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.92.0
-QTMIN=5.15.4
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-KEYWORDS="amd64 arm64 x86"
-
-# remaining tests fail for some, bug 668530
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 87ec4a9051f8..76adcdf29611 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-22.04.3.tar.xz 1091116 BLAKE2B 2512597a4a741de579d82af9d331cf8a7eed60c147e65e78817702649ea59be3dca14a91c9a7407d7825ef91d113881644b89ca736cea6ec02e697b0e2316e8c SHA512 1070b60e513ac0abe15ea0de17606833c87b6ed5e8a15a8230c240c0777b5ee5d021164db0270ef77f5190eb75b64514c30c64761aaeb9ddfc37fab330c257c9
 DIST kdev-python-22.08.3.tar.xz 1091148 BLAKE2B 9825263a060eac750192324c27f09bbdd99aa81ebe3c26379ff4ee6e2e0ef945d20ebf736c0885657aac05afd385a0076173d4f0a1ef7460f471cc2696e74412 SHA512 0f0de58ff92167d618b80a92515728b24851e78f548f16708c3e203723818dbb60e40939df2b12678cf17715c964440218b210307d33bda04fc8d177c87e4655
-EBUILD kdevelop-python-22.04.3.ebuild 1225 BLAKE2B b8b17ddfe7eeb22c17d1b3223c7847e3eef6b917b59d1c6f367f47d55ddc9827de08d50759e01c810a9a55d35f12799c984ca372aaaa634592dd12d89cd45d15 SHA512 1b8a4a64333544231753ef83134ee0d76997672ddc9081fed6a07d0da0ede4877ddf6793eb629fac1f6e050051f3a2ba9406e6ee5cc3a4c4a8e06b47d36270d4
 EBUILD kdevelop-python-22.08.3.ebuild 1225 BLAKE2B 1a8c0d6dc4d42e96194726e91d56423cda42bea2ad336e9d0368e7f4acd8ce3d027ce8f7d62d6a836cebfac827577af16d3d76b0f9bc611c2a3a1f19d7386d45 SHA512 15bf42bc1404709ffa6e2098107bdd0b5f7c0699d3dd2491b8acf3384331f8053d31491caee544e32eb0929638f913462880f3ea1bc0e11b51d68573fe49765b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
deleted file mode 100644
index 6ff29bd2ab6a..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-22.04.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{8..9} )
-KFMIN=5.92.0
-QTMIN=5.15.4
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-KEYWORDS="amd64 arm64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	')
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 236413d64f64..6c5774d26b5a 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-22.04.3.tar.xz 8426644 BLAKE2B 114ec3d6f94712482ccf485cdb746f51f0898bda62d40a24a21222098596f1026dadebb0f901a030cfbf5cfd8bf6d66a22b4960bbeeadb16baf12b62d90e5816 SHA512 a78a2a1e5232369a676297ff52f8f3cf0e003c28d0513628e4a0c37a91018232f4c7f485021a73d4bb617f383483b8795713038fa30c7e5d63675e9b78251a71
 DIST kdevelop-22.08.3.tar.xz 8451936 BLAKE2B 61e6aa657687a3e8459385c164c084157a231aef3457b030ea9245dd8cface0407bcd64c7bad14216b16ba14236b8bf30ddd58e08b2f681dcb22797d0dade18e SHA512 757c073ebf43245dbd8ded85465244a3f6237e9d097aa52620b01a003136214ff692c7752224a039718a00c76b31b74ee255195535254ed04aa51e29628cfb58
-EBUILD kdevelop-22.04.3.ebuild 4134 BLAKE2B 8a471a9b0b29c1dcf81952b1dd56c2fb179915c027ccb52fd7b351f8af37ba3cc3f2d4c49974dcdf4b2b8e5dd6c4c050141526e18b7f3635d77cbc911d6ce585 SHA512 e8964f506e074f98bc76bdbfb09a40134b87f2d8a8cb20f226e4438201f8634fef89b90292225edc7ccaf1fa07d7b45105eea373db825248052dab9d1a08cf36
 EBUILD kdevelop-22.08.3.ebuild 4134 BLAKE2B 68033467cb14798c1c93e06e31ec4850b1311a24ac0961fc247e28c46ec33a2835393139099de78e5c1475c051cf112f567d37b03e93c34f0020c1239fc5d44a SHA512 7e58fd6cbae79799cf3e0852589513a4cc3924d82d4e912566b9b76cc41745eb9d3e6a2701b3cd44b8c9740ee283c3691f4353553dcbf5f29f1d6fe71d507126
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-22.04.3.ebuild b/dev-util/kdevelop/kdevelop-22.04.3.ebuild
deleted file mode 100644
index e99c8510ec01..000000000000
--- a/dev-util/kdevelop/kdevelop-22.04.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.92.0
-QTMIN=5.15.4
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm gear.kde.org optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-# see bug 366471
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/grantlee:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-util/astyle-3.1:=
-	kde-apps/libkomparediff2:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=sys-devel/clang-6.0:=
-	gdbui? ( kde-plasma/libksysguard:5= )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	kde-apps/kapptemplate:5
-	kde-apps/kio-extras:5
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
-"
-
-src_configure() {
-	local clang_version=$(best_version sys-devel/clang)
-	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-
-	local mycmakeargs=(
-		-DLLVM_ROOT=${llvm_root}
-		$(cmake_use_find_package gdbui KSysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-	)
-
-	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "konsole view" kde-apps/konsole
-		optfeature "static C++ Qt code analysis" dev-util/clazy
-		optfeature "static C/C++ code analysis" dev-util/cppcheck
-		optfeature "heap memory profiling" "dev-util/heaptrack[gui]"
-		optfeature "meson project manager plugin" dev-util/meson
-		optfeature "formatting configurations via customscript plugin" dev-util/indent
-		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
-	fi
-	ecm_pkg_postinst
-}
diff --git a/dev-util/kio-perldoc/Manifest b/dev-util/kio-perldoc/Manifest
index b6fadfe7f8d4..8380ae20ad90 100644
--- a/dev-util/kio-perldoc/Manifest
+++ b/dev-util/kio-perldoc/Manifest
@@ -1,5 +1,3 @@
 DIST kdesdk-kio-22.08.3.tar.xz 39644 BLAKE2B c927d4bce54ba32bf51deefcdda5fdfd9c9226b373398da784a34a69946b95b4200a4f814074c9bca87bb4fe44bbdbf081cd86a29fd17ea3ae62988da35ce833 SHA512 4e97f1c185df7c0aeaa62e52a5535262468ffffc760139c1a01afa3d77c809a5f7e64dee859496d2d23fb1bc4b4bca2322af0a3f0db6f54b4e94a2d5e6c8fc86
-DIST kdesdk-kioslaves-22.04.3.tar.xz 39296 BLAKE2B 1dff7d1fa62c6c0010f627a4b871f97c36038b0ab04cb93a19b282b6466fff40471f3b92a7f843566de945edfb18542618269665fe414bbf6eb619a1b060f6bb SHA512 9a6ca3077e0016cf736b67ae64f338a61ab88dca2cb6119585e5e923de587772409edfc491b2d7d6a0480132d8df0453f8bfbaab852f39d3bfdb67fd6faef2ec
-EBUILD kio-perldoc-22.04.3.ebuild 496 BLAKE2B 73b48a27ae3149154d3610abb9383af4dab68fbbe7c01ec9d0477d5e17387f4688dd3d676e8ff0f454afda54b2eb76cb5187ec5726fc11049f28ff40b44c117b SHA512 2a86765486d1c367e707e2f52b664355fee9c23e5910d666de90fb71736e9e6a409b0e893de633b5618244963ff1654f842b07054ff4831479a392b04e9353db
 EBUILD kio-perldoc-22.08.3.ebuild 490 BLAKE2B 4c57a099e7145b2be643aaf06035f90268f10cdd7eb90c50c44aa13c2e5794acb9cd95b18fe533e102b2d1f287102af9e90d1f56ab106b1b055e2ffbb43396cb SHA512 a7ad3ce1c90257d93648f9386b5bc55e2ca264d120f0461f68b9fe3fa7a401b131f054a6636eac3c8d15cd0100022e166670f1b47f698b03a3e7459950188d0d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kio-perldoc/kio-perldoc-22.04.3.ebuild b/dev-util/kio-perldoc/kio-perldoc-22.04.3.ebuild
deleted file mode 100644
index 5d63ea0c048c..000000000000
--- a/dev-util/kio-perldoc/kio-perldoc-22.04.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="kdesdk-kioslaves"
-KFMIN=5.92.0
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker interface to browse Perl documentation"
-
-LICENSE="GPL-2+ || ( Artistic GPL-1+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-lang/perl
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 710174245478..e4169fe7c00c 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,10 +1,7 @@
-AUX libabigail-2.0-musl.patch 1911 BLAKE2B 58f9099cde19a18a44f2e1db208b74b8ee7371c2033da539b46af824d29067e13a543619013012d8fe8ca718cc7ee37fd06314608bcca53b2177d5d84cf54a86 SHA512 4591d3f838ac42e28ae28e059be0837c473edd41b44e942e5a7fbe324ed57afdf6244d4a93696b4498ab3c8d74fcb7175abbe951e4b2ef45ef59f985fa846ec3
-DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
 DIST libabigail-2.1-docs.tar.xz 45532 BLAKE2B e59198a4ecdc6e0eef2b53ce62daa7a313e3dd3f28b71bc7184ec44745b165fab05bb08d22aa9a5e7f886c3b9156f0713737aa2899b579555b18daf8894e6a43 SHA512 078639bd08fdf190b8e71fe147495e0b6b14c7947e82d7aa5f5943ba00cf02763dc8c63a7d39189958a6cfb5175efff6a87cd74938fb3df8f7e123c5586605a6
 DIST libabigail-2.1.tar.gz 405861148 BLAKE2B 28c8c7cfc33b5002d10b94e2eb9e16ef403dcce73c1404b8af011d8bf71b142b62a5079154af078a479b4528f8464c420322b814e75bb3127a09992e7ca8f84f SHA512 4fe1d3323f078a76a7529c15a809d0c0d3ac43cabd5ab4bb5c2d03992cbbb61bae3ec858e40796bf9f65029cbc779d258ae4559455178fb95cb8b53bf92bcc9a
 DIST libabigail-2.2-docs.tar.xz 46776 BLAKE2B 469981ea9879b202bcfd68dfa1d71c25470c6c9b9a8058ff29923a4cb7ecd5cb652b239bf6faa05c6b7e479b425e2fd4327a0d6e1703f3622299d743b72e8b5c SHA512 c06bfa95957390ca7abd1e47a79e2da813fd3bdfb8dcaf23bf81da697c77b67d9cd5457010291e2753fcc74f55803a1c81234aa3b8cb27c6b1ce3991f6ab60ab
 DIST libabigail-2.2.tar.xz 351078692 BLAKE2B fc03b1653fbe94213713e710c358133a2abd51cac46c8d4b5d797715b16e3d9923ddd99f9a2f85352599b6b5628f52e505f0ec2bca6dc3ea118826bbe69ff42b SHA512 c512c4a497ea6bb88283feae6c31cf5fe347c260cf1670fe65296bf158d3a2aa449ca518a4f2780e814ffbe6970c7856d2ab91e15499638db78bc52d67d794ce
-EBUILD libabigail-2.0-r1.ebuild 1799 BLAKE2B 09bd488160175ed6215731a1ca5e5ae124c3154a79a7cbdffb38e694af3127bfddb218c5344b98802c160eed3e155cb3b30d6a51c798667861a1f5ac5ffaa5eb SHA512 d5bc22432ba3e4dfb7df1d964682df5e8952ce0afa014ef4764df8fbf7a1b9c942ec13c69b1da12b829a97f41644ffafb4729ea71245dd408d0cbebb3511a0a0
-EBUILD libabigail-2.1-r1.ebuild 2757 BLAKE2B f54ce5f405cefe8d307d35ce8aafec7a94775b27c33393fce3a330770eb4267fc7358baebe71bf2ee79f47024b9832b3858ac15bece3494f2f5a86e31efe7536 SHA512 7e35a61437d99c8238e6655c354e322758cbfd07e064aad867738a6f25a08aefec43e4dd2bc00d27e7ca17e983a37e5391dced49fc9c020be8fcd7a562e627b1
-EBUILD libabigail-2.2.ebuild 2736 BLAKE2B 8f57a8a891f67c36b0b6f942d81db8c21f6123824f874ef3cfdf2709e4458c84a10e229eb465f990eb78b947f7783d9f23f04ed5cf5fcc88a41c9fbababc655a SHA512 d3c414c1922450e2839c05dc1746bc23649d277f399fbf50e36fd4d8a876af9cc0e0ef6911db1d43da20ffed77f0d8b85c043544433b5ca97349ef80c06232a6
+EBUILD libabigail-2.1-r1.ebuild 2762 BLAKE2B 786535537ab8bdc0c6f760a20e26d20e0a86e895c2c70c98808b7f6283229e832ffb3a6f9f6c24009d3e9cdf5343b6397361a2d521bff5054ff14284ce5f3521 SHA512 7bd66ef1116e4a8462138c7485fb69d7f6d6178d7c01ebc979276237d0eda4404372ac95d75946ac215f45bc4a7731b72465e717d81543f13466cc51cbbd6be0
+EBUILD libabigail-2.2.ebuild 2741 BLAKE2B 0348937bba6bb48ea32a9677470b03d4864ddf3f5cda99dad2aa86e113be69d45da8efc4bab4dc52ba8c9960129cf965913ddec18e7fbec86ef8f5d666c49c68 SHA512 dc436791c61c22bb958adc55f3eb3f3ba51bd52c92bbe3fc6152bf7e1f7bd218932a00c79f5c3c1ccd03a5497574d5c2ab44b5db71582626da8f1af48b3793be
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/files/libabigail-2.0-musl.patch b/dev-util/libabigail/files/libabigail-2.0-musl.patch
deleted file mode 100644
index 6057c65622a6..000000000000
--- a/dev-util/libabigail/files/libabigail-2.0-musl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -143,6 +143,7 @@
- dnl *************************************************
- 
- AC_PROG_CXX
-+AC_CANONICAL_HOST
- AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_INSTALL
- 
-@@ -201,6 +202,12 @@
-       [CFLAGS="$CFLAGS -DBAD_FTS=1",
-        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
- 
-+dnl On musl, we need to find fts-standalone
-+AS_CASE(
-+  [${host_os}], [*-musl*], [
-+    PKG_CHECK_MODULES([FTS], [fts-standalone])
-+])
-+
- dnl Check for dependency: libelf, libdw, libebl (elfutils)
- dnl Note that we need to use at least elfutils 0.159 but
- dnl at that time elfutils didnt have pkgconfig capabilities
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,12 +41,12 @@
- abg-symtab-reader.cc			\
- $(VIZ_SOURCES)
- 
--libabigail_la_LIBADD = $(DEPS_LIBS)
-+libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS)
- libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined
- 
- CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\"
- 
- AM_CPPFLAGS=\
--$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \
-+$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \
- -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \
- -I$(abs_top_builddir)/include -I$(abs_top_builddir)
---- a/tools/abisym.cc
-+++ b/tools/abisym.cc
-@@ -11,6 +11,7 @@
- /// in its symbol tables and report what it sees.
- 
- #include <elf.h>
-+#include <libgen.h>
- #include <cstring>
- #include <iostream>
- #include <sstream>
---- a/tools/kmidiff.cc
-+++ b/tools/kmidiff.cc
-@@ -11,7 +11,6 @@
- 
- #include <sys/types.h>
- #include <dirent.h>
--#include <fts.h>
- #include <cstring>
- #include <string>
- #include <vector>
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -37,7 +37,8 @@
- 
- abipkgdiff_SOURCES = abipkgdiff.cc
- abipkgdiffdir = $(bindir)
--abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la
-+abipkgdiff_CPPFLAGS = $(FTS_CFLAGS)
-+abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la $(FTS_LIBS)
- abipkgdiff_LDFLAGS = -pthread
- 
- kmidiff_SOURCES = kmidiff.cc
diff --git a/dev-util/libabigail/libabigail-2.0-r1.ebuild b/dev-util/libabigail/libabigail-2.0-r1.ebuild
deleted file mode 100644
index 96de89727269..000000000000
--- a/dev-util/libabigail/libabigail-2.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools bash-completion-r1 python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils
-	dev-libs/libxml2:2
-	elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-rpm415 \
-		--disable-static \
-		--enable-bash-completion \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	local file
-	for file in abicompat abidiff abidw abilint abinilint abipkgdiff abisym fedabipkgdiff ; do
-		dobashcomp bash-completion/${file}
-	done
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.1-r1.ebuild b/dev-util/libabigail/libabigail-2.1-r1.ebuild
index fb2e698ad110..dec332c4e027 100644
--- a/dev-util/libabigail/libabigail-2.1-r1.ebuild
+++ b/dev-util/libabigail/libabigail-2.1-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 		sys-apps/texinfo
 	)
diff --git a/dev-util/libabigail/libabigail-2.2.ebuild b/dev-util/libabigail/libabigail-2.2.ebuild
index cfaccef7ea23..e57b7f1c2158 100644
--- a/dev-util/libabigail/libabigail-2.2.ebuild
+++ b/dev-util/libabigail/libabigail-2.2.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		app-doc/doxygen
+		app-doc/doxygen[dot]
 		dev-python/sphinx
 		sys-apps/texinfo
 	)
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 349154f7e7ad..da735c048931 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,5 +1,8 @@
+AUX 50poke-gentoo.el 334 BLAKE2B f5519ada4b710ea3c7aacdf716674b4a5d8b1af3d639b5de72f58cf974335ca49a27641c305c31fc34e07d88fedb959674d402355324b89fe955df73e418f302 SHA512 293ef7fbe66bbba71580173cebed9ba0bbe76f862e4ddc6ec78302724e7fc9eb159e40404bee46c32a30f472efeb7ed60d464b4324d0c8ca8cf147220a4d76ca
 DIST poke-2.3.tar.gz 7369945 BLAKE2B fe9274099a9ddacf1f46b7cec1f98cc6c442b24f149efbf4320a74a270dc8bad7cf3f87df817c9968a13ece763573b36f0ec99699cb9c7742b7be9023a4fca39 SHA512 101ef0009676c02f72ffb4889a02c9a161f29f412685249c7166f69077b0cd1b19d940567ebb86894bacf2278a2e138354fd49456f12b05a4c1957f437ff1d86
 DIST poke-2.4.tar.gz 7372092 BLAKE2B 64b8b22713bb581c30b624200c0a283a8de548895db2c21d83babbb18a93f3a8975dd7af752bd7ea856242f90035add249fbb62462ac632bec351598bcca0fe5 SHA512 6fa1097a5cbbd4171b6a390934c5648b4c382b8b8c8dd4955bba82cb57107f67e23b39f2df2081904a02f457e6c5b2d10baed710da3ed4b9b9eab3f4127e12bc
 EBUILD poke-2.3.ebuild 919 BLAKE2B d5edcf4aca522c508b2f3b3116983dda26824b50d9390e498e37c3d67f43e9f5f62391501c0dd9b77769ed649d2e177e243f32067948751a8168b7dcf93ddeec SHA512 8c7a9c529e2f32b51c7cb79e2748abbd805420254f8f398a8cc7b35136b2a5a71a44ac40e04f869e97e58286815b6037bdcc94e51184625ee7773e895e515a14
+EBUILD poke-2.4-r1.ebuild 2427 BLAKE2B 4a3f75e14c67993dd55767dda65da2a9f9e5b7734385e79732f12232ebdba1f881c9376787e9e7b688e4cf4102a6045c750eaf7ea540301213d126a7271ee61a SHA512 0265badd46fe1da752494ffd769b060c3ebf575cdfdc38ea54b99163bf7b23792978fa5d849ee6bbceb4123f78381ab6946aa367baecf6edf880b28a22603713
 EBUILD poke-2.4.ebuild 1430 BLAKE2B f61f4eb13bf0f5d47e50c1c60df5d4f4548b3dff9ac719b4108ce9daa4dcae7f577128979ca3deff6c4c6502bbfbdf8a8d1130246c60dc7f164c50cf9da7b84e SHA512 81f235a365d29b1935bc3d34b21c57b999c757da0b5ab58786332cdae8ccdd0193cf5ddba8d3263290a63647b10fdfd4ac077e27a454cae9587c4d9219150bcf
-MISC metadata.xml 674 BLAKE2B 49967bd2b2686b6fbc52e0793b3b6196911b1badbceb1828459e422f0bb5a4e8ad7cc9ab8c10fe87c81040305a9a58ce8f0ddf7d2db4a25861b3605f81bfa775 SHA512 4c7deb851048c0570c840240313d5a094bb6945d23ff8a51d5e7b154913d6527c1735092541bd67e84af13d54bfd2e780b6081fe67255df1766fea64d04e17de
+EBUILD poke-9999.ebuild 2148 BLAKE2B f309891c4c847ad63db7c6950043cc4e8c46c7b51aaf76b7db810dee7833a0dfc9d46f769d3675a7ceac732f0cced4fcfe066224dc7c547ff0ffbfc6680c2b5c SHA512 5da9208f367197dfd2f74b81b826f34d413d739c0449da31af2ebd57b7d9e7f3ebb1c069ba42193b7e9657667442a85fcfbf5ab24926961aeb50217f7d496f47
+MISC metadata.xml 775 BLAKE2B 7b6c458435c2c0e2e22d853d6948b5cb1084aca3fda16d6e5a06968ff2687063acd48ec0f2d2e54cb7359791e86da9b8a9deeec7375ac10a936e2c03298081f1 SHA512 a0704750e4adc983cb5af00df0630491f8f47c0638d3c430e3e791b248790255dab29b3e4738efffbd408b5c4ec4253674e0da9658985480c494da2c7e05088c
diff --git a/dev-util/poke/files/50poke-gentoo.el b/dev-util/poke/files/50poke-gentoo.el
new file mode 100644
index 000000000000..5a173875dbcd
--- /dev/null
+++ b/dev-util/poke/files/50poke-gentoo.el
@@ -0,0 +1,9 @@
+;;; poke site-lisp configuration
+
+(autoload 'poke-ras-mode "poke-ras-mode"
+  "Major mode for writing poke RAS programs." t)
+(autoload 'poke-map-mode "poke-map-mode"
+  "Major mode for writing poke map-files." t)
+
+(add-to-list 'auto-mode-alist '(".*\\.pks" . poke-ras-mode))
+(add-to-list 'auto-mode-alist '(".*\\.map" . poke-map-mode))
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index 16899f52a82c..87e485e63e50 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -12,6 +12,7 @@
   <use>
     <flag name="machine-interface">Enable machine-interface protocol using <pkg>dev-libs/json-c</pkg></flag>
     <flag name="pvm-profiling">Enable profiling in the PVM</flag>
+    <flag name="nbd">Enable poking at networked block devices via <pkg>sys-libs/libnbd</pkg>.</flag>
   </use>
   <upstream>
     <remote-id type="savannah">poke</remote-id>
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
new file mode 100644
index 000000000000..c903cab9b818
--- /dev/null
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common flag-o-matic
+
+DESCRIPTION="Extensible editor for structured binary data"
+HOMEPAGE="https://www.jemarch.net/poke"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-2.16
+		sys-apps/gawk
+		sys-apps/help2man
+		sys-apps/texinfo
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="emacs pvm-profiling nbd nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boehm-gc:=
+	dev-libs/libatomic_ops
+	sys-devel/gettext
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	nbd? ( sys-libs/libnbd )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( nbd? ( sys-libs/libnbd[uri-support] ) )
+"
+BDEPEND="
+	${REGEN_BDEPEND}
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		dev-util/dejagnu
+		nbd? ( sys-block/nbdkit )
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./bootstrap || die
+	fi
+}
+
+src_configure() {
+	# See bug 858461.
+	# Upstream support might happen one day.  For context, only one file needs
+	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
+	# others do not.  The build system will handle this at some point in the
+	# future.  Until then, just filter out LTO.
+	filter-lto
+
+	# NB --disable-{gui,mi}:
+	# These (AFAICT) have no consumers in Gentoo, and should not get any,
+	# preferably. They are slated for removal with Poke 3 (should happen
+	# towards the end of the year, possibly), so they should not be relied
+	# upon.
+	local myconf=(
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--enable-hserver
+		--disable-gui
+		--disable-mi
+		$(use_enable nbd libnbd)
+		$(use_enable pvm-profiling)
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd etc || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		cd etc || die
+		elisp-install "${PN}" *.el *.elc
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/poke/poke-9999.ebuild b/dev-util/poke/poke-9999.ebuild
new file mode 100644
index 000000000000..c50ed72d70ea
--- /dev/null
+++ b/dev-util/poke/poke-9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common flag-o-matic
+
+DESCRIPTION="Extensible editor for structured binary data"
+HOMEPAGE="https://www.jemarch.net/poke"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-2.16
+		sys-apps/gawk
+		sys-apps/help2man
+		sys-apps/texinfo
+		sys-devel/bison
+		sys-devel/flex
+	"
+else
+	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="emacs pvm-profiling nbd nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/boehm-gc:=
+	dev-libs/libatomic_ops
+	sys-devel/gettext
+	sys-libs/readline:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+	nbd? ( sys-libs/libnbd )
+"
+DEPEND="
+	${RDEPEND}
+	test? ( nbd? ( sys-libs/libnbd[uri-support] ) )
+"
+BDEPEND="
+	${REGEN_BDEPEND}
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		dev-util/dejagnu
+		nbd? ( sys-block/nbdkit )
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_setup() {
+	use emacs && elisp-check-emacs-version
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./bootstrap || die
+	fi
+}
+
+src_configure() {
+	# See bug 858461.
+	# Upstream support might happen one day.  For context, only one file needs
+	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
+	# others do not.  The build system will handle this at some point in the
+	# future.  Until then, just filter out LTO.
+	filter-lto
+
+	local myconf=(
+		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
+		--enable-hserver
+		$(use_enable nbd libnbd)
+		$(use_enable pvm-profiling)
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		cd etc || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		cd etc || die
+		elisp-install "${PN}" *.el *.elc
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}