gentoo auto-resync : 25:01:2023 - 08:07:03

7 files changed, 24 insertions, 118 deletions

diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index e21a28f5d005..ccf9053c2faa 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,10 +1,7 @@
 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
-DIST poke-2.90.0.tar.gz 7503533 BLAKE2B d5ceb3ae95025d34ba6efb14b437d9bb4c24c2bbdd782a551ca58ef45044c6059f073816a95a5eafe6d2e44eed5cb32b006a6bdbd74143d1b2ae0f885c131be8 SHA512 44e48988b20ddfebc988be9027455e9dda5a59aef09822967f275645b07155971b6de2e4554560c825df19625e01fc565469488826d6f687c92865f45ab35065
-EBUILD poke-2.3.ebuild 919 BLAKE2B d5edcf4aca522c508b2f3b3116983dda26824b50d9390e498e37c3d67f43e9f5f62391501c0dd9b77769ed649d2e177e243f32067948751a8168b7dcf93ddeec SHA512 8c7a9c529e2f32b51c7cb79e2748abbd805420254f8f398a8cc7b35136b2a5a71a44ac40e04f869e97e58286815b6037bdcc94e51184625ee7773e895e515a14
-EBUILD poke-2.4-r1.ebuild 2432 BLAKE2B 2a0eb45d73af42774cd462895ab99c351a7d40137bbfb521a592ba85136ff5e7e0ecd880d33672f1ce36ede5100de3fd22c3ecb28ae8bd430723cc91b56dd48d SHA512 a47ed1fd936ec5face5a9f119dd158565c01f7f868ea4be9db045f72d9c1250a14100431ab5e94d8595752ef8b28037da42deba6a889c8437d320c3328cc92a7
-EBUILD poke-2.4.ebuild 1430 BLAKE2B f61f4eb13bf0f5d47e50c1c60df5d4f4548b3dff9ac719b4108ce9daa4dcae7f577128979ca3deff6c4c6502bbfbdf8a8d1130246c60dc7f164c50cf9da7b84e SHA512 81f235a365d29b1935bc3d34b21c57b999c757da0b5ab58786332cdae8ccdd0193cf5ddba8d3263290a63647b10fdfd4ac077e27a454cae9587c4d9219150bcf
-EBUILD poke-2.90.0.ebuild 2278 BLAKE2B 5b26043a486e84566833d240627a47436cd14d9f645b8b1e763379c72b7d530afa40fa31909deb479a978bbf36c94c0d9b170e2864bb6d987ea0ae2fa21d11e3 SHA512 9746e4f9841ce8e8cbeb6eef37456336d3c95beb95e2ac4404f40c7b8180a38b81d7351c68505523a2ea2b0e43a0e915701fbc97f6cb190d111540c78eb2b837
-EBUILD poke-9999.ebuild 2278 BLAKE2B 5b26043a486e84566833d240627a47436cd14d9f645b8b1e763379c72b7d530afa40fa31909deb479a978bbf36c94c0d9b170e2864bb6d987ea0ae2fa21d11e3 SHA512 9746e4f9841ce8e8cbeb6eef37456336d3c95beb95e2ac4404f40c7b8180a38b81d7351c68505523a2ea2b0e43a0e915701fbc97f6cb190d111540c78eb2b837
-MISC metadata.xml 623 BLAKE2B 51e59bebd2ed9b0bd17ec7e11081231742c058afe507ffccefd7b4209b44c9df071fa55df5f91f2a7fa8d15592cc6bb6b57f14f7d9f2c36a56c358f1f5f13bfe SHA512 7f571cd8cff23315c74ff749a6cec43cf5a97314159db15a9fd354c885fdb30db7f5c9b70beba56d9a6aa03141a2ffde8b3625406ae737d3688e0b5cb38d1ade
+DIST poke-2.90.1.tar.gz 7512925 BLAKE2B 38c9283f1c0b183b1b74c2ebd347edf6e9a9191d19070f7da32e6b0f520ec8197be3a813bc98160b47363cd11069bdaf84bb528498fe51cf2dcadf0bfa06a25e SHA512 f5823bed61ab64c2cdde83c918716fe64ad5552499023b2f5202130d6b2bab405c9d1cb1e12c7f190749689d86bf36f4edfe140ce748ac4c5f03d219197558d3
+EBUILD poke-2.4-r1.ebuild 2587 BLAKE2B 51d6c8738370b2a3b79c778d3be9c3c92bb7c3926c5d94a89fb9beeb77c381785b1ac8cf5b486bb4aa61f9f85a58a82f9d643d54e0023655a04a9554abc99ed0 SHA512 d99702f55c432319ae953dcb759aa103ac67153de07a216bf77fa7ccd595179230edb724f10e649a88e3f27d6e4da77a1214c6cba65d0ed5fa9c163be5505fc6
+EBUILD poke-2.90.1.ebuild 2285 BLAKE2B 01ed0496432709cece66fb8667146e65057c120120c6c4b43f674cd5aa3d765d088c2c0142cf9196a6ef901984a3637480ba2f61e4f0f36291684393d84d73e1 SHA512 0cc9cea5afea3dce7106a3a9c070befa92f9d94f94475909a3784d1c7f1bd275d8940828431c0eea6e15271e199253c610ed88ee837cbc40de47ef4cbdc45dee
+EBUILD poke-9999.ebuild 2440 BLAKE2B a80af75903ec4038786cf9f61b61614799c9802946dc1c9e0f415e9d0e0d550fecfc1f698e3c44af86da4faa84fe16171f5cfea82a622c1ab3634fc86747dba3 SHA512 b49bb765f70e5d722ffc848168a59a7fcfe8f5097bc0e3ed85e11f444247d90525d3fe626a6e76a247d6265fcd1f7609234de4181328d94aadb14e2836990acb
+MISC metadata.xml 514 BLAKE2B 5df1664ca8693598aba1a31675859940052e5e3aa6f5b045036e0da3a47a26ed601f6241977c8a1e611a096798f6d219e6818ce2963f88a4d5e4f6595495e877 SHA512 3e60b71e68d20a2b8c6ee0a5133b41a4beccf942a9c52739dbf7f11c998851411464d2882b0d2b2aab96ea00b9994d3dc73b2d68afcf874af1e561efaa97caf2
diff --git a/dev-util/poke/metadata.xml b/dev-util/poke/metadata.xml
index 11ba06c9a172..bf6a99e942a5 100644
--- a/dev-util/poke/metadata.xml
+++ b/dev-util/poke/metadata.xml
@@ -6,7 +6,6 @@
     <name>Arsen Arsenović</name>
   </maintainer>
   <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>
diff --git a/dev-util/poke/poke-2.3.ebuild b/dev-util/poke/poke-2.3.ebuild
deleted file mode 100644
index 239b69e1ccb0..000000000000
--- a/dev-util/poke/poke-2.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="machine-interface nls test"
-
-RESTRICT="!test? ( test )"
-
-# TODO: libnbd: not packaged in gentoo yet
-# TODO: gui: does not seem to do anything :)
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-	machine-interface? ( dev-libs/json-c:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-BDEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-gui \
-		--disable-libnbd \
-		$(use_enable machine-interface mi) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/poke/poke-2.4-r1.ebuild b/dev-util/poke/poke-2.4-r1.ebuild
index 4f71cf92ec9f..b64df1c180ef 100644
--- a/dev-util/poke/poke-2.4-r1.ebuild
+++ b/dev-util/poke/poke-2.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit elisp-common flag-o-matic
+inherit elisp-common flag-o-matic toolchain-funcs
 
 DESCRIPTION="Extensible editor for structured binary data"
 HOMEPAGE="https://www.jemarch.net/poke"
@@ -47,6 +47,7 @@ DEPEND="
 BDEPEND="
 	${REGEN_BDEPEND}
 	virtual/pkgconfig
+	pvm-profiling? ( sys-devel/gcc )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	test? (
 		dev-util/dejagnu
@@ -56,6 +57,12 @@ BDEPEND="
 
 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
 }
diff --git a/dev-util/poke/poke-2.4.ebuild b/dev-util/poke/poke-2.4.ebuild
deleted file mode 100644
index 88d5da88915a..000000000000
--- a/dev-util/poke/poke-2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Extensible editor for structured binary data"
-HOMEPAGE="https://www.jemarch.net/poke"
-SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pvm-profiling nls test"
-
-RESTRICT="!test? ( test )"
-
-# TODO: libnbd: not packaged in gentoo yet
-RDEPEND="
-	dev-libs/boehm-gc:=
-	dev-libs/libatomic_ops
-	sys-devel/gettext
-	sys-libs/readline:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )"
-BDEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	virtual/pkgconfig"
-
-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.
-	econf \
-		--disable-libnbd \
-		--enable-hserver \
-		--disable-gui \
-		--disable-mi \
-		$(use_enable pvm-profiling) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/poke/poke-2.90.0.ebuild b/dev-util/poke/poke-2.90.1.ebuild
index 77f62ea257d8..6bb0f34eb2c4 100644
--- a/dev-util/poke/poke-2.90.0.ebuild
+++ b/dev-util/poke/poke-2.90.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-devel/bison
 		sys-devel/flex
 	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) ]]; then
+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
diff --git a/dev-util/poke/poke-9999.ebuild b/dev-util/poke/poke-9999.ebuild
index 77f62ea257d8..80e149428e9b 100644
--- a/dev-util/poke/poke-9999.ebuild
+++ b/dev-util/poke/poke-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common flag-o-matic
+inherit elisp-common flag-o-matic toolchain-funcs
 
 DESCRIPTION="Extensible editor for structured binary data"
 HOMEPAGE="https://www.jemarch.net/poke"
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 		sys-devel/bison
 		sys-devel/flex
 	"
-elif [[ $(ver_cut 2) -ge 90 || $(ver_cut 3) ]]; then
+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
@@ -50,6 +50,7 @@ DEPEND="
 BDEPEND="
 	${REGEN_BDEPEND}
 	virtual/pkgconfig
+	pvm-profiling? ( sys-devel/gcc )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	test? (
 		dev-util/dejagnu
@@ -59,6 +60,12 @@ BDEPEND="
 
 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
 }