15 files changed, 124 insertions, 71 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ee5e51ef688c..782f7d2acac9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/arcconf/Manifest b/sys-block/arcconf/Manifest
index 8cb46ccadfb3..b1471f7c8622 100644
--- a/sys-block/arcconf/Manifest
+++ b/sys-block/arcconf/Manifest
@@ -1,7 +1,9 @@
 DIST arcconf_B26273.zip 36205958 BLAKE2B 8baf2e96419ddf7459f61f32e48f721d5b7f11ae20e4a2831d1290ccebafcf6a49078caa881a4ec49aa5be3ccfc54ca2dc542cc2630c5f773549b3a7a60bcd79 SHA512 453067e6b0bc49e8bd1bcd97b0059e2f1752d53b062aedeac32a7a27e18122408bffd403a8108c585d67397d4dc7e7cc6ddced9681e215274ed4bf34387ea915
+DIST arcconf_B26540.zip 31325719 BLAKE2B fd09b46ba20b7e7cef745b1b140ef4d58db8b01dba9fdce87d9f3cc064984fb92f1a57b65c4fff2b7908e4131b58ccfb4fb1f24b4a1c3b017ee9a4233178b01f SHA512 58ab17983626cfdec5f3a3b79c16a500ac289a8c97387f8edaea77c203bffaf953e721feb2b6b899695be66b1404e9037ac812b62134e40509dd59c3261552e0
 DIST arcconf_v2_01_22270.zip 47168976 BLAKE2B 95693a1408e5a4d0d638bbf265f2e1e64247dfec2b1078b56860c5fcd4b13ffa5967bfb9967abfd4b79c788aaeb20759b3a9070a84b083c1653e4868a96ac4cf SHA512 0f91a697c44ea0c0561bec9e432e7d4eba8eb8a2b0255a9867bdb183f81e745aee1dcc2b0017847803dbb27f55cad3e985f4bcd3a202c52f5b557fb724e94d9e
 DIST arcconf_v3_07_23980.zip 95993025 BLAKE2B 7a681a05cea01b30fc6d6f152a7fd6b388a5b23c66306e14f3f4da1f257c78169a98590d071130f31df515d665e55fde5d260421dbd890a87eb39724c216a0b3 SHA512 f2b0b17390e62caee08c5835ffb18aaa3c30b4d5878e3f859d03acbd6e45757ff35686fde69103ea1010a8c76ae95571a916d526504f52984f586a6f3a7fc270
 EBUILD arcconf-2.01.22270-r2.ebuild 975 BLAKE2B e2f313e3c7721bca366a9674e722da307f4206a28b32c04d671cc99b06d7ffb942046c05a4cd93636fb1cda6eae09c87c7753797bde6e8d76b422f44ae9371bc SHA512 7a9912a80d62e5456e60c6627ac49f67dd95ea67a9b1c54dd1568e669eb9e7c81d6f548dec7cec2915e205cdcc17bbe6fde3c2e14f6953b5993bf89d28fed56a
 EBUILD arcconf-3.07.23980.ebuild 785 BLAKE2B af6829339bb69f5da6b013dcbd86c46e0889170ddfbf20ba1fc60f49ec078f3f24e88b4074768d1280fc002289f9202404caea42e9e11e097b973218ed913fb0 SHA512 2fdd703985661d7aa86d98039839e69a075aa6f0241435e59cfeea875fc4159a209fe4d781a9c2bbc6b4c21885f488d2c3c0d1f357d45a99869a5350b60248d0
 EBUILD arcconf-4.16.00.26273.ebuild 786 BLAKE2B 462cac260d19211fad186c6f2b3fb8f2f2f436219541409bf00386b243cac79f457df86465d1a77a9d97a764eb5b41ee55152b8bc61ae47c04a9f66d510f34b8 SHA512 3f08d4fe7050efd04cb7d06e23cc8e7f1664394a03399cbdce797c2db00221b77d8ee15f95ba203468297eaf10bb3a02583bd35a315909a4e67850b553df387f
+EBUILD arcconf-4.17.00.26540.ebuild 782 BLAKE2B 7925249ed68f573523265cefef9863624132d8fe1161205b0f14147ab6b2a24dd0d3a63b1db8ae696642597f1d95a33ebf15981de4bbbab4bbc75b0c956457c0 SHA512 93ca21f7e0a5b10e97e9a751b8e912f73386137410f823410ab98d2dfdfca469a9e1d6dbb71abb5a2158b36002e99c5e903e4fc0187b20914a00eae57425fe07
 MISC metadata.xml 820 BLAKE2B 09a6ab9403b4fc8b3687e6c8e11e5c9326e669427fe66d242897f6d8f8419e5f539b1b8c504c063bd93f35c5eca5da0de0ce118418ef3c42891cdb48d3f61937 SHA512 3e8e83d3949897c4b943affe5fbbf646990f28d9861fd8b6b9a5b276b71494baf552efd99a385f434c76d0f68f7e00cfb9a03951330ff6aa171299a30cf736d4
diff --git a/sys-block/arcconf/arcconf-4.17.00.26540.ebuild b/sys-block/arcconf/arcconf-4.17.00.26540.ebuild
new file mode 100644
index 000000000000..e1c01a3e4e5c
--- /dev/null
+++ b/sys-block/arcconf/arcconf-4.17.00.26540.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="B$(ver_cut 4)"
+
+inherit linux-info
+
+DESCRIPTION="Microsemi Adaptec RAID Controller Command Line Utility"
+HOMEPAGE="https://www.microsemi.com/"
+SRC_URI="http://download.adaptec.com/raid/storage_manager/${PN}_${MY_PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="Microsemi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="mirror bindist"
+
+QA_PREBUILT="usr/bin/arcconf"
+
+pkg_setup() {
+	# CONFIG_HARDENED_USERCOPY_PAGESPAN makes ARCCONF segault
+	if linux-info_get_any_version && linux_config_src_exists; then
+		CONFIG_CHECK="!HARDENED_USERCOPY_PAGESPAN"
+		check_extra_config
+	fi
+}
+
+src_install() {
+	dobin linux$(usex arm64 'arm' '')_x64/cmdline/arcconf
+}
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index df99fd972d7c..9b8769c74aa7 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,4 +1,3 @@
 DIST blktrace-1.3.0.tar.bz2 396669 BLAKE2B ab340b27421ec423c8e5bd9fd719f97e06c30366ce95560adea644d10737f41d2c2f16e4c6503b65ef8fedeec7d997de6f47f0d3f2542c5065fe7846f8d18966 SHA512 4cc3d8e0d77e934bd70f447e1bb462400d3c9982460802f093d260e3cb69a66c6f61a63a05af55b84c35c5bdf18027e571d55cebea8c89d0be6d00c7ca9b9174
-EBUILD blktrace-1.3.0-r1.ebuild 1318 BLAKE2B 698f223a52c4c17918e5004602d36827873cd28463aec700ad5690c5b0b4be3bbcbe4b3ef59465a42f1147ec12a0a97bbb8b17c8d5073dd2528c9d46dde1aa8f SHA512 e949e8f8e61af92ddaa54ad0624a00b910c219360d649a64abd4616cfb4b09fe90ea8a877c684374569056015c95029bea61f6881bec0b7ca4f7a5e6b7e92e3d
-EBUILD blktrace-1.3.0.ebuild 1560 BLAKE2B 9324cbb84ca1a955f66784d9b96d27dd07874f20f1fbfd8199dff2d883c93571b956c72ad88d949ff6a703cddef4cef4c8df6fbf6479035c14d364fabaff0e6d SHA512 23091b6e6f1dfd40f1ff0a06c74b4428adc34a78d17d7ea67c223cc3d71734505e390fe1db4678591f53cddcc09570e81519d36ba93fd3578faa7215af791512
+EBUILD blktrace-1.3.0-r1.ebuild 1315 BLAKE2B 25da7e6d232beaff5098a847fe3109b84cc74de07cb55c783bf57ca0c4bba3a6a288c6c35a6f89b77576d6581155edb412d0dc30edbf85c3ffccecddd6a7b194 SHA512 05202a4e23e06c875c3cdb41917a03ac72d1bc5c7aefcf44857d33bf278b11d23fc2686e271b90f816384121c3602ff17d87968cf156a5e29cc4d18b11812862
 MISC metadata.xml 309 BLAKE2B 2f51620b760c1d052a616a429bf9d7a2d32c355af4ab680725b04111ce93b7abdac0eb491a5713a449452c718e1f299428442363edee9b7fb11ae72442431b36 SHA512 f7621d1712406fa86a803e19faac002289eaaaf347360c37c40aab1b635d686768a5b61d7d5f6bac8eae1993762476ce29f5a3389af15eb07dad6dc1404bbc0a
diff --git a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
index cfd56e795983..66b8416124ab 100644
--- a/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
+++ b/sys-block/blktrace/blktrace-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://brick.kernel.dk/snaps/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/libaio"
diff --git a/sys-block/blktrace/blktrace-1.3.0.ebuild b/sys-block/blktrace/blktrace-1.3.0.ebuild
deleted file mode 100644
index 5767d176387e..000000000000
--- a/sys-block/blktrace/blktrace-1.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic linux-info
-
-MY_PN="blktrace"
-if [[ ${PV} =~ _p20 ]]; then
-	#https://brick.kernel.dk/snaps/blktrace-git-20210419122502.tar.gz
-	MY_P="${MY_PN}-git-${PV/*_p}"
-	EXT='tar.gz'
-	S="${WORKDIR}/${PN}"
-else
-	MY_P="${MY_PN}-${PV}"
-	EXT='tar.bz2'
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="show detailed info about what is happening on a block device io queue"
-HOMEPAGE="https://git.kernel.dk/cgit/blktrace/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.${EXT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libaio"
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	doc? (
-		virtual/latex-base
-		>=app-text/texlive-core-2014
-	)
-"
-
-CONFIG_CHECK="~BLK_DEV_IO_TRACE"
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
-
-PATCHES=(
-	#"${FILESDIR}"/${P}-overlapping-io-stats.patch
-	#"${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
-	#"${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
-)
-
-src_compile() {
-	append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake docs
-	fi
-}
-
-src_install() {
-	emake install CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}" DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
-	einstalldocs
-	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}
diff --git a/sys-block/mmc-utils/Manifest b/sys-block/mmc-utils/Manifest
index af9b758567a0..79ef269e57b0 100644
--- a/sys-block/mmc-utils/Manifest
+++ b/sys-block/mmc-utils/Manifest
@@ -1,3 +1,3 @@
 DIST mmc-utils-0_p20231010.tar.gz 51083 BLAKE2B efa8bbae62ccc20ee4085c6b372ce3a35d41cf2aba12918d74d2edb0f779e7174250358d426a756075cf6dd93009b366dfb373a54bc0eb13441c4ee2e579a26f SHA512 c6ee6af49556261f1bee12580025452fa180f0bd913fac90847d86ffc5100f34905a0b0467707601a3638bfad6f3f4fca41df0cd59c7e3507981f991ede6ac10
-EBUILD mmc-utils-0_p20231010-r2.ebuild 811 BLAKE2B 271ba338b7626cf7fde7009fa4a32862b6ddfb4e334c3de4096b57f5e1e01d8d4dd795f12699489a0c9658d164c44e1756d136d3a8c79c8598589af738728ff8 SHA512 ab4088bf6e786c528aa92faedf26fab948b605f5f151bfd56bd7383c66877283ff845ae3c474d247d3d3ea78096481f5f559e31ccd2cbc84d001827e59e9fae6
+EBUILD mmc-utils-0_p20231010-r2.ebuild 810 BLAKE2B 24618a94a6b6d35c85baecdd8f95b4936ad051bb23f08e59ec09e04e8593245114e59f82a6acc7d2cde2dfa46293bf78f60edcc00a7b6593c5b922fbbd789191 SHA512 277980661149ed88e02cc339b6db66f4ae1adf3ff3e237fc6777547b2546909a5d10be0818a4b25bc378f3d2ac6f22551472a78fdb15a1eed3b3c20cb6e38901
 MISC metadata.xml 246 BLAKE2B 3d18899448c3810386e0fc45cf9d1e1521a77c448a3b643edb7ad7e4830881e4112a90a8c7383c9477258187baac81feb7e62fb3f0d05ea473585b9e00726d9a SHA512 023a3d4e2713d0251b78fd608d08ddfed97c3d52775efb75bd8718131e5863687c1e924271cf934cd2953029075cfd8de2e29d61cd3362ce18ebb2d4c5bef7c9
diff --git a/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild b/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild
index e1bd4575073b..310d91c4eac1 100644
--- a/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild
+++ b/sys-block/mmc-utils/mmc-utils-0_p20231010-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="!dev-lang/mercury"
 
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 5f9ce6be7fdd..f859880e6610 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,8 +3,8 @@ AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d
 AUX parted-3.4-posix-printf.patch 2872 BLAKE2B 55c1bef638a88f7d3b5b1f90ca28df1d0ccb40590536c0a0f10416509c3d90a2a329dd530ebbcc9945b2eefb7a3540a113d27a73c7d636b372eb9fc8e19f7eed SHA512 d16bb7e3cfccaa8b40ece90b507559857fb1a4f5a08bc93da61b7afde4b69e06de363948426cec66cbb1135d6d1d5a50206cee6cec9973e1cb02aefe50697670
 AUX parted-3.6-tests-non-bash.patch 3100 BLAKE2B 2aa7c4fcb03cdd354e85c8bd0696a07a09106cc37e482d7bcd720146964468b6d234195ba900dc2afb982f2348bd5455617072e8cace04feef959aad05ccdb30 SHA512 d0b6f9ff544255ae4240dda1d7b44385224dbbf64c8059e5cc1338a348cc2c045eb23d3f3e9c3b4d4fe2fba677a99f235232a38310e95c6565e412e44ed526dc
 AUX parted-3.6-tests-unicode.patch 2009 BLAKE2B 73e376209d1aa99d6f9988e139e2b15f68c78d3fdfc17b86113cb05b2611591d7dadabeee5a72be837bee047d898615f27dfd6e2d8e077ef05de6cf3cfeff4ed SHA512 1fe8f8155b5c155cd39fa859318066e6580497b044e31b22f8a22b8617662e35b028879e5f9bcea1ec6c7e4aad038d5803c635a3e2b57a7a769a09e3194890d8
-AUX parted-3.6-underlinked-util-linux.patch 894 BLAKE2B 9dd271f6f1ee57fdb620e44e8b0431f8bc686901eb186359597551bc26dc39b70cb859a26044c8bcd373ad32c4966593f7e7124497967ae22d9ca387d1e12746 SHA512 20603f536adccf798aa7028415c3ee4b91f237d6d9fe862d0acd1c162a114756db69838b754e4292666fc39cd1b770cde7f50394a2ec7add75d50b91cbd9f38f
+AUX parted-3.6-underlinked-util-linux.patch 2120 BLAKE2B 3aeabc6e752abf84888bc4a50a7f030d103e403a6b8c8c3d7ede0dee1247e0870fb91b502da0f45d4f576bef2408558b5ff68f06e8daf415b9ea4679fbe0bf68 SHA512 c69fe8f298d7dfe41ed37d8df150864ca4abe806b8ce87d606a0dfa3897d30076d751dc23b95923790f9da58547c7f02aadabdd6aa3f8db3a5dae527792e682f
 DIST parted-3.6.tar.xz 1896164 BLAKE2B 99b6d096e4db05144c98e9f0a9a97c647aa911ee5df031244b03d5223f709d43d9302cef12dd4b2f97f42ec476510561b7f8b3b1ef7cb09d0a7c4d512e7a6739 SHA512 034a44b25718acba175212019d24f092972a791c5bd1d921ae91e17478657a77c5c5dd0c832bed7968c3a07ec6c65c0785acfac2f90c1ca5e1692f3c141693ef
 DIST parted-3.6.tar.xz.sig 508 BLAKE2B 92fbf624cfeb474e36d43954ecf6c42cf86557b99c7cd477c648bdeefb3ca2b40c51c320b20ea91075276d9ccc1da4219cd843b2916157c564c92a34a35ec55f SHA512 7c845026937b29fb49085ef9e3354226b73a1c3b5f9082d440d9a8ac13d76b1d07dae0bc10d8c974d4e57bc582f38c0a908e80718dd1ff1adfad3b04699c672c
-EBUILD parted-3.6-r1.ebuild 1843 BLAKE2B 46a7deda8ff862d03a8cbcbf65dcff1e497a3a053471843d013fd26721aaa44324bfe69cb21c3f3ceaf0f0f8880ebd5e23d17065ce2d07ea795dc8534f41e63b SHA512 5add24267cec686607bb483010351b31b727271161a7a39a21d8336989f3e7616d7905a6e445f1b4e15ec280f6204dfeeb52ade17011bdbed85cff23f0c24641
+EBUILD parted-3.6-r2.ebuild 2064 BLAKE2B 2f9b1b3b32f52a309a4b0e7d7fe33e207dce872958ed75d654893e282af1aa65a2cc06873b27f0641a78da2e48fe76ffd483ad20482cc7bb7175512026d59e52 SHA512 772be62fe2960d81c2af23c7cdb0c8a769aa20285a553ba24a0c7f13649f1022344d9e3ef21bb26a1e65814e996b4cbd210c0fca1517bbf9e6479bf729899aab
 MISC metadata.xml 1060 BLAKE2B b37f3b9d7869cb816ece89fa99d2fcd3569ee8d224b1aa4d9f7189169fe91b63762323a2e8b07c57ec4e0dbf46fa325c9919d1d11f09489c855fc7c319c4ffa0 SHA512 1d9646a575046ea235bd2417d70e03b472f7b1fe6a1c2c2fd85cb5acdb03517658020f656a519b83db580c4faa13843ef1b47d5bc645d04f8955415024bc5260
diff --git a/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
index 6e02f4aac8d8..1b23c27398fb 100644
--- a/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
+++ b/sys-block/parted/files/parted-3.6-underlinked-util-linux.patch
@@ -1,5 +1,6 @@
 https://bugs.gentoo.org/910487
 https://git.savannah.gnu.org/cgit/parted.git/commit/?id=d22c2d01f62139e0d386d90584cac0705857a571
+https://git.savannah.gnu.org/cgit/parted.git/commit/?id=60b3300ed6d3ba2e7af4ddce55bd873b232d12ff
 
 From d22c2d01f62139e0d386d90584cac0705857a571 Mon Sep 17 00:00:00 2001
 From: Yegor Yefremov <yegorslists@googlemail.com>
@@ -24,3 +25,37 @@ Signed-off-by: Brian C. Lane <bcl@redhat.com>
  if test $ENABLE_DEVICE_MAPPER = yes; then
 -- 
 cgit v1.1
+
+From 60b3300ed6d3ba2e7af4ddce55bd873b232d12ff Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 12 Jun 2023 10:55:19 -0700
+Subject: bug#64034: [PATCH] libparted: link libparted-fs-resize.so to libuuid
+
+uuid_generate() is used in this library
+Hence, add UUID_LIBS to libparted_fs_resize_la_LIBADD to avoid
+
+"ld.lld: error: undefined reference due to --no-allow-shlib-undefined: uuid_generate"
+
+This is uncovered by lld linker linking fatresize package
+due to this linker defaulting to --no-allow-shlib-undefined.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Brian C. Lane <bcl@redhat.com>
+---
+ libparted/fs/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/fs/Makefile.am b/libparted/fs/Makefile.am
+index 41a60d9..7fa8d14 100644
+--- a/libparted/fs/Makefile.am
++++ b/libparted/fs/Makefile.am
+@@ -75,6 +75,7 @@ libparted_fs_resize_la_LDFLAGS =		\
+ EXTRA_DIST += fsresize.sym
+ libparted_fs_resize_la_DEPENDENCIES = $(sym_file)
+ 
++libparted_fs_resize_la_LIBADD  = $(UUID_LIBS)
+ libparted_fs_resize_la_SOURCES = \
+   r/filesys.c			\
+   r/fat/bootsector.c		\
+-- 
+cgit v1.1
diff --git a/sys-block/parted/parted-3.6-r1.ebuild b/sys-block/parted/parted-3.6-r2.ebuild
index ea3667cc4060..9de1986f0bf4 100644
--- a/sys-block/parted/parted-3.6-r1.ebuild
+++ b/sys-block/parted/parted-3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
 	local myconf=(
 		$(use_enable debug)
 		$(use_enable device-mapper)
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 857717499e12..ee67b35c2c93 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-23.08.5.tar.xz 2148168 BLAKE2B c755a3f828de0acd70f785896c0837a8730b4429b678033d206d67684e648dc43af3d4ae001125fe5a843cc51ef9544c69619e68452936b734afa7d75d37b62f SHA512 5eb6ee5f021a40c597d7f21bc4ae63d05a94564caa32ee72e4a44eb1d21ae7d4628e8bbf5b6645dcf5be2ac3162e5acc712f2982a14ce60ec5acc87409252f1a
-DIST partitionmanager-24.02.2.tar.xz 2159428 BLAKE2B 48cf13adcc55c94d49aa9fd1be98a2a79711c9c5086db67115813da5b60f282ebe242d690aaa93ae3b8d2811a762011fff7617d13efa25ffa264bc62c1d95ad3 SHA512 53694c88828fe83a5e29dd1af6e20d48f4670a4925457ff15f640b5e1d457b1c2fcf266dd358163e2e1b72bd69b570d72dcde9adb8ef9e610666f6bb74eb7094
+DIST partitionmanager-24.04.90.tar.xz 2313884 BLAKE2B 35cb18030490b129ab385a5feef6bc7fb34304d712e2b9542802f9b9bffe991b91c0f7ce53c89c4b134801cabb2c8760e50f6cf2cf461e735bf8498fe81e5354 SHA512 3a3c5d3414cae917704f99217c9868cc693912416efb5d341c07f35572ab29f216221eed05c8c41ec744e4769d8bb505f2205c4e21dcc7285ed26a5e69c29dda
 EBUILD partitionmanager-23.08.5.ebuild 1008 BLAKE2B d85417e4967840b5232a967e01b9b6ee054961ad8490c765e442a753509f9d12571675ad440dffecaa2ebf368a1009a58cc1a60b0d435fb4ec77f151bdae5fa9 SHA512 582e1223b896c255bed3c6ac4be1a3433f706a136f32da026e7c1de6f3f468538ebca43f8217c0fba348588e749c6835ca8dbd1c2f56cd081aa17f2b50fafb3a
-EBUILD partitionmanager-24.02.2.ebuild 957 BLAKE2B 3e91241db0aba4783340abf0c915a665ca44ed5ff1548f1403e0eb918a40414ee657e774a0a745180e7b4dcb04606943c418a2a58770000594a4709da34b5e31 SHA512 95d0409fe78070f8e5a987f6b3aea0d95a994190424f36b619451e5099e6314b66e97ad86829cb70a95bed8b303e62a4685b6a173b85dfeb0fcab660321f892c
+EBUILD partitionmanager-24.04.90.ebuild 957 BLAKE2B 3e91241db0aba4783340abf0c915a665ca44ed5ff1548f1403e0eb918a40414ee657e774a0a745180e7b4dcb04606943c418a2a58770000594a4709da34b5e31 SHA512 95d0409fe78070f8e5a987f6b3aea0d95a994190424f36b619451e5099e6314b66e97ad86829cb70a95bed8b303e62a4685b6a173b85dfeb0fcab660321f892c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-24.02.2.ebuild b/sys-block/partitionmanager/partitionmanager-24.04.90.ebuild
index 587a8862b96c..587a8862b96c 100644
--- a/sys-block/partitionmanager/partitionmanager-24.02.2.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-24.04.90.ebuild
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index eea29a61c952..6d7f0794fea6 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,3 +1,5 @@
 DIST whdd-3.0.1-rel.tar.gz 45657 BLAKE2B 9730e61580359c95fc3e3d23540f3b10e75b476e634cce3be744b8849193f43f968f227bdbd25a0c643106c1343b27070c8b51f33278e902ab54991a05eee021 SHA512 6d5d8dad7537118a5915a29a549e18595da1b6ba031f0ca661805ad0033fd48f32804eb307f67e7b31d6002e708ae578a32aff366f3e610ab36b25f0a4e50803
+DIST whdd-3.1-rel.tar.gz 45806 BLAKE2B dce0230955fda721539891f0e993f25d3777e7d11331bbbd7b7e853dafd2edba043fc598c672634cc8bb65bad5c0ae9f3e26713f98c0d551dc72d08de20e1eb4 SHA512 8960b482d7c3a75b0b9e540092a0c074dbb66561f455fdf454e8cd89cc5dc4dc028e60b44ce74ecbf568af5e7e34a5b3b5deaee9480112f4161d98b773442bed
 EBUILD whdd-3.0.1-r2.ebuild 692 BLAKE2B b8cac90dfb0e6578cdceb3df5e55133c6a0eba4cd598ba1adedc350f1b10ff724c38b4939c144ea06f0c36717b9fb4e617e41d5fbb6d64204985f884f50669d0 SHA512 22b26e2b994f64c4fd66c17835e5b1951db071a088dd149d8a83dd4b1ad6a826419bbccebb1ae4618d2c0c1b29d1d5fd80d1c63052193e13442774ead687cfee
+EBUILD whdd-3.1.ebuild 693 BLAKE2B c65fa343e57b199e88257dc0c7afdfaf328518a9da5225459ce85056738ac168c3239567128331230c38172fc7a589eb90e1bd76fcd6e410c87eb859e2ed8a8a SHA512 8e89e817cc4cd021d2e815bd756598d66eccbbc6fe0065804cbe4da86ca2fff57daccce7f16c3377f373e64d3889e9c6d2809f61ff21a2eb065af7d449f5545e
 MISC metadata.xml 320 BLAKE2B 45eeb9de5a78b1f044939348f2fb7e0befb2a3fe2aa66da3dbe30c122c64c105142ba44bfec78e2d760b5a8a185698dc5389bb8f3d9f644dd5c0ee686bd882ec SHA512 ecefce54584273fc6fc699534fc671aa361542c72f0525e779da25180b843b9ee6eb42f467097c3d06b7da200575ac9bdc2c8e1af26e02a6b89f6e7c40a65a16
diff --git a/sys-block/whdd/whdd-3.1.ebuild b/sys-block/whdd/whdd-3.1.ebuild
new file mode 100644
index 000000000000..5009455fad36
--- /dev/null
+++ b/sys-block/whdd/whdd-3.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Diagnostic and recovery tool for block devices"
+HOMEPAGE="https://whdd.github.io"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-rel.tar.gz"
+	KEYWORDS="~amd64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="dev-util/dialog:=
+	sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}
+	sys-apps/smartmontools"
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+}