9 files changed, 39 insertions, 108 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c8523493dd98..ba74b5345c51 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 23d50c341907..1b1e34af520f 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,6 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
 DIST cpuid-20240916.src.tar.gz 157553 BLAKE2B 2f5ef3264fcc647122a73edf9a2b39110c11a23ac366c99481ec8cec4d7108ce088847b485f6b8e7dece757fb0246bafbbbaad36d0dc8128ade3290988a1f7de SHA512 f78e36400a963d39fb9d1b6dab6d79ea1ab700912aa229a4efc2088e61964fb5ece52c2204fadd34f1f75cfab6f7b659288c8892b86c44568e784283bf3f5278
+DIST cpuid-20241023.src.tar.gz 160816 BLAKE2B de3c5750e8bd90882ac3a13ad81196b0287bd2ee321c54adda18a754e128f9c72b72177874c652ccb02d17ace336c70705c899f3e6493e7f4c655a9f992114ef SHA512 81d4b4de609365fb801d785fab9c4f190885569fa97db10ab5e8f7e227a335313c0bafb02696a0bb1d14d11c49e90979a2b9b60eb970e6d7c617be99142a941b
 EBUILD cpuid-20240916.ebuild 608 BLAKE2B aa200b62c4a747cb023b971149c30f4d6b3c69ea505e248aadd7ae3d8e68166eca457b607c1e953a59660c5486103b4a033cf13ba21de17d97db4355d6dc7dee SHA512 988cb0fb9c34d9cd7f3afb49a289294de88125fec858bb6b3d920a46d869e1b675748301cdb2d869d2397d32eded64b18118004f952a5bab47a1ee36a9d00cf9
+EBUILD cpuid-20241023.ebuild 610 BLAKE2B d07e1630231fdf16335eda46ab506f12c810dcd753e7b78138baab9c1f371790460e1ff51d0ecaeac74ced6bdadc7049e496935e01922a346f1dd6d75089f39a SHA512 e6b88a77b8ca8e7aeb6e66c29ccb5070468cf8348092f879d5d3e3a24d6c606da06b68aa71ea20c948bd164a1a5495850496d9dd6e702d300de45ef96e485eb5
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20241023.ebuild b/sys-apps/cpuid/cpuid-20241023.ebuild
new file mode 100644
index 000000000000..c2868c0d5525
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20241023.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="
+	app-alternatives/gzip
+	dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index df6a07e65c2a..1dae263941a2 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -4,5 +4,4 @@ AUX man-1.6g-clang-15-configure.patch 2654 BLAKE2B 902ad27f926c73a0abd002d27f66a
 AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
 EBUILD man2html-1.6g-r2.ebuild 1146 BLAKE2B 3c981b29db4f0f74bb3655e08947f8e2d9f43378ccc27a0f19803d9bcb11bf57009f398b0dfb23ecb16acd65b44b66ba05d3dc7561fad4b5904e5437400d1db5 SHA512 dabd0571468c4113d0f1b10e7b9aab3aa0eea07b3c46de0dbc97d38316ad9f9f2ee258865fa6edbae5d2fa27852021ba0f55bc720fb216231e062ec74d89475f
-EBUILD man2html-1.6g.ebuild 1097 BLAKE2B 22c3bd32cbfc876208207810ba329bbd84ee18ddac61c396812cfcc4957d1940d6a26ef83c0b41eb69b9e12b68f8aae77126bdef9616ca88a257032e68b9be98 SHA512 834bfd3fa09db5c8fffde28e10000de59b18616978c2aee1a2fcd56cb66b01d4b35accac8423d62f4bf472844102b52cef0f0e62b23392d5b9ddd90cba61bf57
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
deleted file mode 100644
index de0853bbe7c4..000000000000
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit edo toolchain-funcs
-
-MY_P="man-${PV}"
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="!sys-apps/man"
-
-PATCHES=(
-	"${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	"${FILESDIR}"/man-1.6-cross-compile.patch
-	"${FILESDIR}"/man-1.6g-compress.patch #205147
-)
-
-src_configure() {
-	tc-export CC BUILD_CC
-
-	# Just a stub to disable configure check.  man2html doesn't use it.
-	export COMPRESS=true
-	edo ./configure \
-		-confdir=/etc \
-		+sgid +fhs \
-		+lang none
-}
-
-src_compile() {
-	emake {src,man2html}/Makefile
-	emake -C src version.h
-	emake -C man2html
-}
-
-src_install() {
-	# A little faster to run this by hand than `emake install`.
-	cd man2html || die
-
-	dobin man2html
-	doman man2html.1
-	dodoc README TODO
-}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 1e6c7de34df1..c5f336e43ba9 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,6 +1,4 @@
 AUX mawk-1.3.4_p20240819-tests.patch 396 BLAKE2B aa24a1f960103857a746d8e932b9a18f779df9beacf1caf6fb131ff0c87426409125b7fff10a64e4f26991e340f5c754c690e5c6229fd2eb6c12edeb2708673c SHA512 e9f084af868b06a7b7b82d1e412acf3666dea3547e1a1a476c14ab7f46b10c6f8b87d387d5a531e11d67dccbf1994ac1e1913ad79bd6a3f7f2e046f63dbb3914
-DIST mawk-1.3.4-20231126.tgz 413452 BLAKE2B e3907cf88ea3daaaf8a1d12eb9fe3cb726be8b8e8d3c8d9ea5b25b8127c5d054d8a0c600da90f7dabcc0fcee2c987628ade15b7225698e417fee63e49689a8a4 SHA512 faacd473df97fc51cf3ece652e0826b13c26e8de5fa87746dfcc097811a9464a71e5630a8f3b4d243e0c1dc0199751b64d9a1bf34fe5080b646c0e5fff231e0d
-DIST mawk-1.3.4-20231126.tgz.asc 729 BLAKE2B 72d8e626aac6354f2e568eb118f2d19b3d770ab8b23449163e84941cdbd8539b0e39edb0446176fc64ecfe2deac81e98f1107df1bdbd815569bf5d6b08d72cc3 SHA512 19a9725f84651f87ecb38350984a60fce52046df45be7c494e615db91f6b76229d3dba20211bca41b90a7370fbba97fcb7bb2fe475ffb880fac7f1116f14333f
 DIST mawk-1.3.4-20240123.tgz 413943 BLAKE2B 29a9c89995e969a62bd0b30e494c67e53aea0466c9286e2005422a54a44bef661ef6223522c4b51bc49b83c56512ae47e784c237dd39dfef77b7aa13ec33973a SHA512 f6d5da44280afeac4a9bb6d3788ed71ee816daaa5816f49b9d40add5292f3ae06e5af007a6c993d14405238cbb70ba4997fdd2fcd5901c9a1a4b61357045c4a6
 DIST mawk-1.3.4-20240123.tgz.asc 729 BLAKE2B e4ba4ddd1f3227a9dc922a1325b00fac2d9c95a848fdc03f57eaa5f354bf45da218cbf6e931b5c1464b799c05d10ff7fe95d1eb81221b4afba468bedc7805815 SHA512 3b4b8b8b7b74aff7061158a7c284d1949c09d52d78003b678c9dcc1da036a4d84b873103d76362866daf914d5a7d717c71baf13d30d7e882b03c5f87c8e4c452
 DIST mawk-1.3.4-20240622.tgz 414190 BLAKE2B 3238e633546ea04b0e3822271fcd37d1ac6ae3924c9e7655ff14c9fa35d691ba27bb779e7c1b7f95a46c0aa90b75a71ab2681763c89812f55773e97489e03ff8 SHA512 29fed436502531e226af5e04bc54c2f4f9430c80d863f27e520401577c1f03a10d8a0d9def94c71ca43de40a7b1f450340802de37a7276bfe91d029779b1460e
@@ -11,7 +9,6 @@ DIST mawk-1.3.4-20240827.tgz 423080 BLAKE2B 3844a0240e55b5287397763634ed16fb2929
 DIST mawk-1.3.4-20240827.tgz.asc 729 BLAKE2B d1958ba9d04d249c744f48430ccb9deb34b0bbad5e733e2f720269d128f4f2916e6acc69fdfdd7b6b66d755a1b800847da7befa18aa9f1417ea44014e7adf6e3 SHA512 5930fad06cc53de14ff8eb14548b4a3aadf47ac93f2a7122c74db49583fe2d0eb07c29bc0082870e2760c7250c26e0e336fbba918a7c54cef6f75caf0b600357
 DIST mawk-1.3.4-20240905.tgz 423935 BLAKE2B 7c15dddeb4f7afa5a94eb6c3a1f3d84be0e6ccbb56e6ba337f44432a272fd1cf6b162ccfb520f6aeb2393b174a89ba945bb6a325c584721a2ea5b89c073851de SHA512 769ce73112cb912ea82ed18f9a106209c4284a32ede41a4d8af64e862857323a9515551a4e7420d0c0fb6ea5773340771c7d68b17794fb9a810d39783fbdc1d2
 DIST mawk-1.3.4-20240905.tgz.asc 729 BLAKE2B d4db8a008cac7e0a274de689ebef9fe5d7e820937cf61f9bfcac5bfeeff6e70ab920d759e750c3f7248c63876cfa4230e51b0a50b213c91e85c7e59da3e03b24 SHA512 f30f560aeb58dfcb878c2a2d756a88d68c3ed62c3232e7ad9f20469a3bd1fae667276a20a0866dd481f08830551dee6368194421e9e0370d9daa33c520230c16
-EBUILD mawk-1.3.4_p20231126.ebuild 1292 BLAKE2B 4dd35ea625d13e2bb21eed8a9ddffcdefb4211ba970a2fe7674f920126452a2d720cd753b7af988948e264ecddaaf64a96d862020b1a53e9970372727918af4c SHA512 732bc4fa64e7cf94499c8a906484b22d1c8758f6603b8a7055ee4e6bd998b29cdbd4eee35bef210f3b4b19035126ff1a80ffb1269cc96e955799d952c9ff6eac
 EBUILD mawk-1.3.4_p20240123.ebuild 1292 BLAKE2B 5eee6c13ced45b7d9a9d1262843304a9ce56b68532b33f795ff0bce98ff4cd246741683b89f0174d577027847ad8a8531301c4f60c32c4e8e153ad6924bf08a3 SHA512 0a4364d54585eef2b1a23b23678f7f93298b07426b81af065fbf2c63dba55ad421085ab01991337b383bd57c5c76a7095118331d7192c43ede1251ee15c25ef2
 EBUILD mawk-1.3.4_p20240622.ebuild 1300 BLAKE2B 3efdcb2f4c2c24c069e74e1241b0c47dd1317e6b8bc137b41168e9ee5366e133009e36906b36be15943ade8f21db935a0e8a22c924389bd50052dc194da6042d SHA512 110b5b5f41327d02a9107a2d5598fc008ce8cd63908e3effecdc1df43920d9cf6181064d10581e2b2959e420c1265fadcacc68d5dc95767c04fb9bb97d475127
 EBUILD mawk-1.3.4_p20240819.ebuild 1362 BLAKE2B a4a193890918d6bf951765d60fef1a214f6a1afb7f1b577badf2f17878c51b219b8afdbe381941e8404ab699d4ccc249cb0d982a881989a744c2bcf684f45272 SHA512 e6ef5323a03c71adc251ace0db6287a16ab0f911437f2f62191e2a44d0b1e738011797eb43fc9d2cef718e49852d6046a1add6afa6d2e6e95e27daeebdec2c32
diff --git a/sys-apps/mawk/mawk-1.3.4_p20231126.ebuild b/sys-apps/mawk/mawk-1.3.4_p20231126.ebuild
deleted file mode 100644
index b38e74d6a2bb..000000000000
--- a/sys-apps/mawk/mawk-1.3.4_p20231126.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit toolchain-funcs verify-sig
-
-MY_P="${P/_p/-}"
-DESCRIPTION="An (often faster than gawk) awk-interpreter"
-HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
-SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20230810 )"
-
-DOCS=( ACKNOWLEDGMENT CHANGES README )
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	arc4random_push # doesn't exist on Linux
-)
-
-src_configure() {
-	tc-export BUILD_CC
-	econf
-}
-
-src_install() {
-	default
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
-		eselect awk update ifunset
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect && has_version app-eselect/eselect-awk; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index e5767a50f352..de7ce370cd5b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -21,6 +21,6 @@ EBUILD systemd-255.11.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d
 EBUILD systemd-255.12.ebuild 15238 BLAKE2B 834f02a0001137b4435a7d90764279cc5fb4044f088258852f27b3c96b0b4986abccaffc75826944adc7a6fdee3c5e7c9599e354233a4eec5d7fb9b2cc4261d5 SHA512 170064f830a56925ac5fd70c3209131665d84195458494ef73a05f2e6c3bc438f08839bd0b5dea2eabc7b1a71ddce8ab7a5ba3e49d82ad41669be43f7e4bf110
 EBUILD systemd-255.7-r1.ebuild 15230 BLAKE2B 3f29ad915e4984bfa1928b68508053681030d7ca18f57aea525e959870e52d0711eb660985a3229dbdac1fc75e1072d26ea0106bdf9e5c838f4142bd73b7a41d SHA512 585b08fccfa2d0ff1caccfede77c56e34b12231a1bbc534a40e85dc807e9d3cc42e5ca9c43cabb5768cdac997c63f54c08aade4e138fd5d4a99792b0bf1c03c4
 EBUILD systemd-256.6.ebuild 16226 BLAKE2B 8b4c9d42c64fe0e0f3817da49dce9dcf4d1c329af71f3ebf123f09b9a8fbec71866fbf78622c337ea53f9f34b147c034c433a5bc6b58862df97a94b99f81cb18 SHA512 21150f9979ef78a8658956172c0bf27b8cbc5d6114819537cb1471a6d257744ecf0e94c271cee9a3f98ce1a050a2521f1eef902d76320be69312fc4c2d9289be
-EBUILD systemd-256.7.ebuild 16226 BLAKE2B 8b4c9d42c64fe0e0f3817da49dce9dcf4d1c329af71f3ebf123f09b9a8fbec71866fbf78622c337ea53f9f34b147c034c433a5bc6b58862df97a94b99f81cb18 SHA512 21150f9979ef78a8658956172c0bf27b8cbc5d6114819537cb1471a6d257744ecf0e94c271cee9a3f98ce1a050a2521f1eef902d76320be69312fc4c2d9289be
+EBUILD systemd-256.7.ebuild 16223 BLAKE2B 88d2e588f51ed28aae2fd3c08d56357e8e357c5db750cad14e7c975717b7fdd55b8e0e347cf227862d86e83d1166f1bee7824ceea763e669f7032e31d19584cc SHA512 c4a1c4d589587172fbf06d5f12e9cc0e8e98ab43137b31f88914922e707537cc797ecea090074cc5dbfa8e4519f761bab5a2ff3778e1fabea0742b6e3aed5f02
 EBUILD systemd-9999.ebuild 16204 BLAKE2B 60b1e6168ce2ed5bc0f25ee0cdd8de5fe07d492203ffb0f8fcb5db88065e0b001d5ea0141c08fddaf17b3d4afdf0c71457beb31300d493503d72589d36182f80 SHA512 c2ffec6cd8035f40c18dca4b49048cf5a14a876f3a8c06ca07f2ffa3dcbc541eec37a42f0cbe6ed38cadd6fd7ea61bb80415af458cae909c31666165c1cc3015
 MISC metadata.xml 2686 BLAKE2B cd65634500cfb85ace929a24ce7d21603d50d6f532e0445bcca9b888050f347dd162696045267995b14f3d0985a2ab0d99441b323c9e596ba68dc04d6239bc0a SHA512 7dec9047b453b28d796a5e589aabd975838f48a51ba5e1267aa5c8f91a3cca97bef33419cd38c652a522ba347e63a0a5f5a427c4894ea656cffd94e2680f8f89
diff --git a/sys-apps/systemd/systemd-256.7.ebuild b/sys-apps/systemd/systemd-256.7.ebuild
index f957b4c395ee..729d4180671c 100644
--- a/sys-apps/systemd/systemd-256.7.ebuild
+++ b/sys-apps/systemd/systemd-256.7.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/systemd/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 fi