gentoo auto-resync : 02:04:2024 - 14:14:14

14 files changed, 115 insertions, 916 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ed4f52cca824..021d8d1a67fd 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/poke-elf/Manifest b/dev-util/poke-elf/Manifest
new file mode 100644
index 000000000000..6bf79cb8ea48
--- /dev/null
+++ b/dev-util/poke-elf/Manifest
@@ -0,0 +1,4 @@
+DIST poke-elf-1.0.tar.gz 272395 BLAKE2B 43490739f87ef82427a2d5f46f38e83271a5dc15e50b19bdaae6acf8a337f9c590e671fe023b8f722a66bde4b3bc38ca48ed09887991d8d6ff32fe9dc7f928ca SHA512 43d84b20cbd1e76d170623290aa8c9cee0d4188ca0605352514bc13b7bae435fdb2bd35a3271902b9d5a758598030e152f8ff19be07d6abee1cf43bae1c434c8
+EBUILD poke-elf-1.0.ebuild 866 BLAKE2B b3ea46a9aca6268b8e6d730f17f7dab4e9af4f738da430ae1aa98dba2afde9f1c2e60540db8a57edc4eab5a955c0f758b251bcac15f905199a502d546f90c0ca SHA512 c3a390fda44c03e58b50268d937a453e5572991c6408eb7da258fc1b51fcd10919f50e4867ba0f6357bbeb4aa5a2e0f4835a997c2b2a40b7181844f5cb304a5f
+EBUILD poke-elf-9999.ebuild 866 BLAKE2B b3ea46a9aca6268b8e6d730f17f7dab4e9af4f738da430ae1aa98dba2afde9f1c2e60540db8a57edc4eab5a955c0f758b251bcac15f905199a502d546f90c0ca SHA512 c3a390fda44c03e58b50268d937a453e5572991c6408eb7da258fc1b51fcd10919f50e4867ba0f6357bbeb4aa5a2e0f4835a997c2b2a40b7181844f5cb304a5f
+MISC metadata.xml 339 BLAKE2B 24ebb2cca11439e93168e2b2fe0b8dfb7b18558dd040460947983a67f60c5360908b08b961d0f14211e355a2301a72e7aac378194380673c0c809fcf1618d775 SHA512 b3b6bba8e19918d576c367491daa455bbd93b1b44067e394677e07cdc6a5394161fde4235b27d181a04ff0a96dd98a5a035016cec6095f7d6010faad8c004bf3
diff --git a/dev-util/poke-elf/metadata.xml b/dev-util/poke-elf/metadata.xml
new file mode 100644
index 000000000000..3b2c69aa7f48
--- /dev/null
+++ b/dev-util/poke-elf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>arsen@gentoo.org</email>
+    <name>Arsen Arsenović</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">poke/poke-elf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/poke-elf/poke-elf-1.0.ebuild b/dev-util/poke-elf/poke-elf-1.0.ebuild
new file mode 100644
index 000000000000..600328292079
--- /dev/null
+++ b/dev-util/poke-elf/poke-elf-1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A GNU poke pickle for manipulating ELF files"
+HOMEPAGE="https://jemarch.net/poke-elf"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke/poke-elf.git"
+	REGEN_BDEPEND="
+		>=dev-build/autoconf-2.62
+		>=dev-build/automake-1.16
+		>=dev-util/poke-4
+		sys-apps/texinfo
+	"
+elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
+	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=dev-util/poke-4
+	!<dev-util/poke-4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${REGEN_BDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
diff --git a/dev-util/poke-elf/poke-elf-9999.ebuild b/dev-util/poke-elf/poke-elf-9999.ebuild
new file mode 100644
index 000000000000..600328292079
--- /dev/null
+++ b/dev-util/poke-elf/poke-elf-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A GNU poke pickle for manipulating ELF files"
+HOMEPAGE="https://jemarch.net/poke-elf"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke/poke-elf.git"
+	REGEN_BDEPEND="
+		>=dev-build/autoconf-2.62
+		>=dev-build/automake-1.16
+		>=dev-util/poke-4
+		sys-apps/texinfo
+	"
+elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
+	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+	KEYWORDS="~amd64"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=dev-util/poke-4
+	!<dev-util/poke-4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${REGEN_BDEPEND}"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 7716b27295b2..923a00bbfc95 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,21 +1,7 @@
 AUX 50poke-gentoo.el 334 BLAKE2B f5519ada4b710ea3c7aacdf716674b4a5d8b1af3d639b5de72f58cf974335ca49a27641c305c31fc34e07d88fedb959674d402355324b89fe955df73e418f302 SHA512 293ef7fbe66bbba71580173cebed9ba0bbe76f862e4ddc6ec78302724e7fc9eb159e40404bee46c32a30f472efeb7ed60d464b4324d0c8ca8cf147220a4d76ca
-DIST poke-2.4.tar.gz 7372092 BLAKE2B 64b8b22713bb581c30b624200c0a283a8de548895db2c21d83babbb18a93f3a8975dd7af752bd7ea856242f90035add249fbb62462ac632bec351598bcca0fe5 SHA512 6fa1097a5cbbd4171b6a390934c5648b4c382b8b8c8dd4955bba82cb57107f67e23b39f2df2081904a02f457e6c5b2d10baed710da3ed4b9b9eab3f4127e12bc
-DIST poke-2.90.1.tar.gz 7512925 BLAKE2B 38c9283f1c0b183b1b74c2ebd347edf6e9a9191d19070f7da32e6b0f520ec8197be3a813bc98160b47363cd11069bdaf84bb528498fe51cf2dcadf0bfa06a25e SHA512 f5823bed61ab64c2cdde83c918716fe64ad5552499023b2f5202130d6b2bab405c9d1cb1e12c7f190749689d86bf36f4edfe140ce748ac4c5f03d219197558d3
-DIST poke-3.0.tar.gz 7510801 BLAKE2B 4e80bd0603b0f690f7b6dc9b3913bb165f61160cd6e677751e6f8ea444bc395141204cc32c3ed97bad4b4044d505a800a64a4c973200e7338b50f05d9ea90c25 SHA512 5b786cdfae732a1f7196b0c4bf271c97f204f8fe9de9b34d92704f35150c8abfc2c080940d67efac63e3e82d0d4afe2fde4b75066faf9f4d1e9df6b6f62edb96
-DIST poke-3.1.tar.gz 7562582 BLAKE2B c348973185e7f33d670a9dccab60c02e8ccc247c5aa46936ac4b04674687c9e7edae707639a16c3853232b422d0c969930fe3879b59c1dba351fe7c3da56d34f SHA512 5680ce13b0a8e9a1f2770d295bccf7ccbe3aff54f3f4301a12c4719f54a6717ce5addb6ae3fe0478d0e426ccc756ef06a5e852b0d6ada0f8d3c587640ad209dd
-DIST poke-3.2.tar.gz 7559660 BLAKE2B c1d5739a1a497fb3daadec53fe812b65ec787dd268030a6517764541497c82451f4df391f3c434ef7729bc8e3762c31852ef3ce41aa83928e7646c40bde557dd SHA512 bd3651a2962165b318cc59c53604199eb6278ee3be45c18c36864612b0926d78a06f0e1338fdcc1fcd1cd48e2792bb3cd36a2bb5383143a66dc3aab023c0019c
 DIST poke-3.3.tar.gz 7553544 BLAKE2B 1e98f77937f9c45daa80591be603a74857b1bbd230cb931e59d7e9753c1687d5a4c96837bb6aca76615feca71cbeabd3be7ad234260657288d060ff63d59c040 SHA512 b00dca38d27bddee6ea131d45988aaead1d11d29b757c048f3b2be8013575cedc591844d4d99870f90964fd4f517d500cbb42aae5aff57e9fe07aac8273aa236
-DIST poke-3.90.0.tar.gz 7971780 BLAKE2B ef4a5e0a25f1851e4f44314cc9e3b62c6eeb7458d5c4b3da1d7ea798c7b58b57c4ba113e3dac221e757b0d52d8b609c9cd1910a82f36d9aafe0393a1a1fa6a02 SHA512 34b2baee4317582d4ca68001b9f1bd540277c6ef133ebec49de6d45db0d564815da376b4f9761369e80976570c4bbd05272b215e78391b0a818390e613e21b1a
-DIST poke-3.90.1.tar.gz 7953029 BLAKE2B f098fe68316d172e700a896fdc588c6ae5d352eca21b5230940902e51adca8b57d19093d406b6fd66391e79025d79604cf3db63ef3f7783b65cd39788a727c76 SHA512 0d4d4b63ed5448427a72ecee182065bc6fb86eb460f9a05daef2d40d5678a5352a568d0f403cce17e6711c7a82875c91d0e00890162ac85636edbf6e277d1f3e
-DIST poke-3.90.2.tar.gz 7972908 BLAKE2B ca1b616300d6c14b4aa95ad19df4e5e78c993a3e5172112fbd25d50b406a4832f6392d597eb7e970ea5cfafd0936ca395cd42dd38d9d65070411e11bae0d07aa SHA512 d754921dce62730da6e75b8184352aeb8df6aaaafe3698ccf0063758f3d9ed3faa48de4e0ba8720060141a6581fb1595ac755f394bd8e951f6e608fd268b7572
-EBUILD poke-2.4-r1.ebuild 2601 BLAKE2B 22d1fc25a12e11578728742150ec3d48b1f3cfaf49c39879148735a9a4af4360bf7561f97d77f28309a2d9ebba2e443639f54fcf5d5db98e1386d96f1574ed5c SHA512 86936f8039c7389a52e6137d498169fd8b4710e15bf9fe179b82a4b2095f5b290baded078f2aa09ea66c7ebaba4e6f70fe25b7b516382dd07c86abe49e9beeec
-EBUILD poke-2.90.1.ebuild 2300 BLAKE2B 39e204187868b66f2e3a73916e6afab650a0ae7e2ed76006b173e60a85d9848a4ed687d805770e46580d7d402a1245a370d60755f12d6596c9389f274a139bf7 SHA512 e92e05271e6bc612e20551b78c260de47b53800ad72d09db7da6ee3aa2105e76c855bc2488c5de6ab789578f66c20e8aff8a51d41c7e631be98e51c24d0a4722
-EBUILD poke-3.0.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd74149cb1b0321fc563dab9ffdaa3175c88d1f870eb353b7ac8db520349c184c13c5dd5e2da981885adc7dbf SHA512 493dd8a3bc740cf5ab7fb7a4a4babae71f9efd5e1aa91bbc9f1b8956e448840951cde6dd0c4608e994cd2fd940b04873751327b9612a83800f8f6cc620b6b314
-EBUILD poke-3.1.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd74149cb1b0321fc563dab9ffdaa3175c88d1f870eb353b7ac8db520349c184c13c5dd5e2da981885adc7dbf SHA512 493dd8a3bc740cf5ab7fb7a4a4babae71f9efd5e1aa91bbc9f1b8956e448840951cde6dd0c4608e994cd2fd940b04873751327b9612a83800f8f6cc620b6b314
-EBUILD poke-3.2.ebuild 2575 BLAKE2B 60a5ab9efe5cf26106c85369946dff302f7dfcdcd74149cb1b0321fc563dab9ffdaa3175c88d1f870eb353b7ac8db520349c184c13c5dd5e2da981885adc7dbf SHA512 493dd8a3bc740cf5ab7fb7a4a4babae71f9efd5e1aa91bbc9f1b8956e448840951cde6dd0c4608e994cd2fd940b04873751327b9612a83800f8f6cc620b6b314
+DIST poke-4.0.tar.gz 8224479 BLAKE2B d7778274e2fcf3657e800ebc8b2a11e7c0e9d81b5a41ab366d7dbf8772afa8ec0f7c07c70eae1c297acc1b5ac9fb584fb6bdb1c6eedd94c62ae9123aefe08df2 SHA512 3b6a15bf5542b34a794efd31bd575b5024c14f71474581b845097f38b43cef178ee2078f680ab9ec329b4336d1b99cc5832818bd4e7a6372fec6f95e9a11534a
 EBUILD poke-3.3.ebuild 2574 BLAKE2B b8653eaf3b947bc84b28fd244091fa2bf090345cdad027acbac4851f0efe56ad6a5ade677984a7bf8df388e51eda9c1e0d1fbc00af2e6aed229614a58c1d510f SHA512 f4393dade5ab20cbe49856ef7ec90b1259dee115eaefd08f0a7092b22d36137488eac6b5798c66c911fb801b116bbadc775ed7b6cf5d431251e4ba403c6741b7
-EBUILD poke-3.90.0.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b
-EBUILD poke-3.90.1.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b
-EBUILD poke-3.90.2.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b
+EBUILD poke-4.0.ebuild 2728 BLAKE2B 8fd7195203063f4e47423ad876215ce6ba3345d767f4648b0524349a7b6c7dd00e14bf44d6e529320a297adcced845df3ea86d48184e06b5f587ce58b0cda6a4 SHA512 952d4f42578ddc5b4ffe927544d3e8e1dd2ac2f2f7f20bcc3b9234f97a67ff771f09bed4dfa8f12019f692ea0554857653579e4601ee15d62cdfc15d98e95263
 EBUILD poke-9999.ebuild 2455 BLAKE2B 719f98bef4695a5bf4e2e2dab13f5dedd8183e80b2fa9b7f870120ac2fa4e09ec829dda60594a453a9a7dc6cdbccb320527cd77f90fd875077b1c5783d677fc8 SHA512 f7f7b9ab53fa226014fec33c2db446607d398a473ba38da55ed407a5a73fbbe4f1fcc7d04a9f31b768d076b05fe680385a12b40fb22c3ffc7528e68092c4897b
 MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
deleted file mode 100644
index b44a7334de30..000000000000
--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-2.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	# 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-2.90.1.ebuild b/dev-util/poke/poke-2.90.1.ebuild
deleted file mode 100644
index 540363525164..000000000000
--- a/dev-util/poke/poke-2.90.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 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="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	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
-}
diff --git a/dev-util/poke/poke-3.0.ebuild b/dev-util/poke/poke-3.0.ebuild
deleted file mode 100644
index 993b532d0a88..000000000000
--- a/dev-util/poke/poke-3.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# FP, bug #123456
-	MIN # gl_MINMAX
-	static_assert # gl_ASSERT_H
-	alignof # gl_STDALIGN_H
-)
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	local myconf=(
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--enable-hserver
-		$(use_enable nbd libnbd)
-		$(use_enable pvm-profiling)
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd etc || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd etc || die
-		elisp-install "${PN}" *.el *.elc
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/poke/poke-3.1.ebuild b/dev-util/poke/poke-3.1.ebuild
deleted file mode 100644
index 993b532d0a88..000000000000
--- a/dev-util/poke/poke-3.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# FP, bug #123456
-	MIN # gl_MINMAX
-	static_assert # gl_ASSERT_H
-	alignof # gl_STDALIGN_H
-)
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	local myconf=(
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--enable-hserver
-		$(use_enable nbd libnbd)
-		$(use_enable pvm-profiling)
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd etc || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd etc || die
-		elisp-install "${PN}" *.el *.elc
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/poke/poke-3.90.0.ebuild b/dev-util/poke/poke-3.90.0.ebuild
deleted file mode 100644
index 1aadadd1833d..000000000000
--- a/dev-util/poke/poke-3.90.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	local myconf=(
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--enable-hserver
-		$(use_enable nbd libnbd)
-		$(use_enable pvm-profiling)
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd etc || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd etc || die
-		elisp-install "${PN}" *.el *.elc
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/poke/poke-3.90.1.ebuild b/dev-util/poke/poke-3.90.1.ebuild
deleted file mode 100644
index 1aadadd1833d..000000000000
--- a/dev-util/poke/poke-3.90.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	local myconf=(
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--enable-hserver
-		$(use_enable nbd libnbd)
-		$(use_enable pvm-profiling)
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd etc || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd etc || die
-		elisp-install "${PN}" *.el *.elc
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/poke/poke-3.90.2.ebuild b/dev-util/poke/poke-3.90.2.ebuild
deleted file mode 100644
index 1aadadd1833d..000000000000
--- a/dev-util/poke/poke-3.90.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic toolchain-funcs
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/poke.git"
-	REGEN_BDEPEND="
-		>=dev-build/autoconf-2.62
-		>=dev-build/automake-1.16
-		sys-apps/gawk
-		sys-apps/help2man
-		sys-apps/texinfo
-		app-alternatives/yacc
-		app-alternatives/lex
-	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) -ge 90 ]]; then
-	SRC_URI="https://alpha.gnu.org/gnu/poke/${P}.tar.gz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="emacs pvm-profiling nbd nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-	nbd? ( sys-libs/libnbd )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( nbd? ( sys-libs/libnbd[uri-support(+)] ) )
-"
-BDEPEND="
-	${REGEN_BDEPEND}
-	virtual/pkgconfig
-	pvm-profiling? ( sys-devel/gcc )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	test? (
-		dev-util/dejagnu
-		nbd? ( sys-block/nbdkit )
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_pretend() {
-	if use pvm-profiling && ! tc-is-gcc; then
-		die "USE=pvm-profiling requires GCC"
-	fi
-}
-
-pkg_setup() {
-	use emacs && elisp-check-emacs-version
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./bootstrap || die
-	fi
-}
-
-src_configure() {
-	# See bug 858461.
-	# Upstream support might happen one day.  For context, only one file needs
-	# LTO to be disabled (since it's an autogenerated bytecode interpreter),
-	# others do not.  The build system will handle this at some point in the
-	# future.  Until then, just filter out LTO.
-	filter-lto
-
-	local myconf=(
-		--with-lispdir="${EPREFIX}/${SITELISP}/${PN}"
-		--enable-hserver
-		$(use_enable nbd libnbd)
-		$(use_enable pvm-profiling)
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs; then
-		cd etc || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		cd etc || die
-		elisp-install "${PN}" *.el *.elc
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/poke/poke-3.2.ebuild b/dev-util/poke/poke-4.0.ebuild
index 993b532d0a88..4f6fda3e59da 100644
--- a/dev-util/poke/poke-3.2.ebuild
+++ b/dev-util/poke/poke-4.0.ebuild
@@ -60,13 +60,6 @@ BDEPEND="
 
 SITEFILE="50${PN}-gentoo.el"
 
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# FP, bug #123456
-	MIN # gl_MINMAX
-	static_assert # gl_ASSERT_H
-	alignof # gl_STDALIGN_H
-)
-
 pkg_pretend() {
 	if use pvm-profiling && ! tc-is-gcc; then
 		die "USE=pvm-profiling requires GCC"
@@ -124,8 +117,20 @@ src_install() {
 	find "${ED}" -name '*.la' -delete || die
 }
 
+pkg_preinst() {
+	UPGRADING_POKE=false
+	if has_version '<dev-util/poke-4'; then
+		UPGRADING_POKE=true
+	fi
+}
+
 pkg_postinst() {
 	use emacs && elisp-site-regen
+
+	if "${UPGRADING_POKE}"; then
+		ewarn "GNU poke 4.0 moves the ELF pickle to a separate package."
+		ewarn "To install elf.pk, please install dev-util/poke-elf."
+	fi
 }
 
 pkg_postrm() {