6 files changed, 3 insertions, 228 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6f6862c5c19a..eb7f0b45e58e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index b1e1ece10430..3709074c5ee6 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,10 +1,8 @@
 AUX libblockdev-2.28-sh_tests.patch 1552 BLAKE2B 3b26cf271a0cb2a0f51ecffe51c9caf9a0ac1c65aecb5adc845a2721f3ac7178df7c994b7647b4fa1bbfd27baf072325bffedf723555c39e164f7d7645163090 SHA512 11fc498db4ed1d3a9e5a9288e1137d64f7581cc7b2d265292f7a3899ef5cfc6d63138fef7f87695abd9d518fa1c74a8bd98ebb54038211eeb0afe7964d85c6c4
 DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
-DIST libblockdev-3.0.2.tar.gz 1067300 BLAKE2B 97170434d98a66b90ff3da3d094ce6cbf29b338967e9b2dbc9edee9bdd730a63678efbd15c94c4c6604b1499956d744c102d26c116794c4e44fcfb871afd252d SHA512 5285aaa4a8e66aacc70461b2c0b0ffe57121ee6136bfa7c46c3ebbd1da517278f8760207f983d69707096c8293e6f7a1d59caf03e742c3d8009ceed25b8c3e89
 DIST libblockdev-3.0.3.tar.gz 1048628 BLAKE2B c26a806797effc7231a0eb92f1b8cd74e548da5b1800cddd75a21e7df327be8371edabc2e9a39a727291f365b6a4f6242f78b66396adc4526b41749219f0429f SHA512 f2cc6fbe1df6fd9886016177a4a94984d704f3b402c7090344c581afb89f7cb050c9516c52974157a99ea6c6239f6a1f6079cde0b43a2336af0daca7311ca788
 DIST libblockdev-3.0.4.tar.gz 1050971 BLAKE2B e31ecb04310c2c66cbe432c1e003b3c3241f318f78916d5c61c0efca37fa677e5f857eab9b7c3bfc7c5a589350cdef12402940d28af68ab9fc95e5da6852ddf1 SHA512 82b574c1f8e301d6e9ff07f8c3d2a351a5bc966b5d65a3b578c214e03e48b54270b54176d646ac15e8119c79536d08b36415de478ffd34c8b3fe536300fc5172
 EBUILD libblockdev-2.28-r1.ebuild 3025 BLAKE2B 7f74654f050b758ba445aff5964a1933b128d578f43f4ecf89b1fcb4c6ec933d0fee28d7fdc660896760886d658bc66f74f58a8ff9a0dcf0220d6d8138d088a8 SHA512 503f8d3410241d0f24bfb9708f8262ad5fca2ac982829c07c35f76fb3c2fcb1055cb46d0c207b3019e7fe226109f01e08830686d66adb6f8abdaf75592408857
-EBUILD libblockdev-3.0.2-r1.ebuild 2934 BLAKE2B cdd1b66b674883427b57769ac6710285aa8df594f83366c680307cf230d76b32ae761abbed25531c100e099cdcbe716be78eb96648563b84998df7f128081143 SHA512 46735dadfa76446d570635a9552292dabc26fb86274884a6243c41eecade81420c617bb4d74617d686f79b6c2e0b0d222f761f3275c4a5c3dda864b3e8a995f5
 EBUILD libblockdev-3.0.3.ebuild 2926 BLAKE2B abf37be1d3e2269cdc8ff5119910a64d45fbc782188065f1059078bbe832a89c917558412ccb3da06b44c50b1b06dbaa120839c8db33d3c8b56d155587cebef1 SHA512 4b5237186151dd192444e789b5d7c47c573510a65b83c85a3632aa37fe8495dac70e6f71ca1573a18b9396c94030ad43cc0596f55fdcb487902b6f300bf6308a
-EBUILD libblockdev-3.0.4.ebuild 2854 BLAKE2B 834ec69836c46777c2d94a3e5a30f95028034010c2d15fe8a9254aed9bb2942ef8654bf0bfe45346d3a9d15b67b16f5725401996428b17e1a4559207c2b7b390 SHA512 05c7274a8b8d83f975901ebb8b910ae3eb547aa832ad4056d187abd0141f7bdc18f6d3819e1142f1e9c16ede8f56707c4f753a4143164ba780df111781c9754c
+EBUILD libblockdev-3.0.4.ebuild 2937 BLAKE2B 248ac299f7f343675d8bcce190a11451321145bf3a228323378c2df4743654870de62c12e58c02885c207bc2b96f5ab46597136c3e7ed5494251878ad9b0b742 SHA512 864c7609f360b527677a7aafbdf4d133bf02ca6676d2a338e31fc5dda574682772131b40ee7d2380f259e2b48151f2c6d8b47ff058035010fe5ddcdd2dcbcbaf
 MISC metadata.xml 1120 BLAKE2B 1a323b7d5b61c6404578f58a880ff7825f818d1efcdf3f78954959cab3906be29651320aad097af181f988b537b8997412c24fec958207b22921462287e8a8cd SHA512 d531b6b1c0fc2e5996b11a16c211c29daa05da580e92ddf01e0ca672dba032a1ce8c5c66c44fa36e10397eec8379690a7299f3dfd811c2a2a8d464af69b3c649
diff --git a/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild b/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild
deleted file mode 100644
index c9c348b7e758..000000000000
--- a/sys-libs/libblockdev/libblockdev-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/storaged-project/libblockdev"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git"
-	BDEPEND="
-		sys-devel/autoconf-archive
-	"
-else
-	MY_PV="${PV}-1"
-	SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
-fi
-LICENSE="LGPL-2+"
-SLOT="0/3"	# subslot is SOVERSION
-IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools"
-# Tests require root. In a future release, we may be able to run a smaller
-# subset with new run_tests.py arguments.
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.2
-	dev-libs/libbytesize
-	sys-apps/gptfdisk
-	>=sys-apps/kmod-19
-	>=sys-apps/util-linux-2.27
-	>=sys-block/parted-3.1
-	cryptsetup? (
-		escrow? (
-			>=dev-libs/nss-3.18.0
-			dev-libs/volume_key
-		)
-		>=sys-apps/keyutils-1.5.0:=
-		>=sys-fs/cryptsetup-2.3.0:=
-	)
-	device-mapper? ( sys-fs/lvm2 )
-	lvm? (
-		sys-fs/lvm2
-		virtual/udev
-	)
-	nvme? ( sys-libs/libnvme )
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND+="
-	dev-util/gtk-doc-am
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
-	test? (
-		$(python_gen_cond_dep '
-			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
-		')
-		sys-block/targetcli-fb
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		escrow? ( cryptsetup )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_environment_reset #623992
-	default
-
-	# https://bugs.gentoo.org/744289
-	find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \
-		| xargs --null sed "s@ -Werror@@" -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Bug #910487
-	if tc-ld-is-lld; then
-		tc-ld-force-bfd
-	fi
-
-	local myeconfargs=(
-		--with-btrfs
-		--with-fs
-		--with-part
-		--with-python3
-		--without-mpath
-		--without-nvdimm
-		$(use_enable introspection)
-		$(use_enable test tests)
-		$(use_with cryptsetup crypto)
-		$(use_with device-mapper dm)
-		$(use_with escrow)
-		$(use_with gtk-doc)
-		$(use_with lvm lvm)
-		$(use_with lvm lvm-dbus)
-		$(use_with nvme)
-		$(use_with tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# See http://storaged.org/libblockdev/ch03.html
-	# The 'check' target just does Pylint.
-	# ... but it needs root.
-	emake test
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-	# This is installed even with USE=-lvm, but libbd_lvm are omitted so it
-	# doesn't work at all.
-	if ! use lvm ; then
-		rm -f "${ED}"/usr/bin/lvm-cache-stats || die
-	fi
-	python_optimize #718576
-}
diff --git a/sys-libs/libblockdev/libblockdev-3.0.4.ebuild b/sys-libs/libblockdev/libblockdev-3.0.4.ebuild
index 5c2aa28dcfa3..96fa6a0cbf98 100644
--- a/sys-libs/libblockdev/libblockdev-3.0.4.ebuild
+++ b/sys-libs/libblockdev/libblockdev-3.0.4.ebuild
@@ -62,6 +62,8 @@ BDEPEND+="
 	test? (
 		$(python_gen_cond_dep '
 			dev-libs/libbytesize[python,${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pyyaml[${PYTHON_USEDEP}]
 		')
 		sys-block/targetcli-fb
 	)
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 2c0b80c63907..62f5902f5e9e 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -4,5 +4,4 @@ AUX libsmbios-2.4.3-insecure_rpaths.patch 536 BLAKE2B 7f5e307002b4898665ee235528
 AUX libsmbios-2.4.3-python-deprecations.patch 1176 BLAKE2B b9cfb5bad98842d786bb5e032c30aec955ce024683dc6ca8ef5e5d64abeab85ae39875dff02f816e3368a5a443e4f271d9c9e8ae275e449de8ac7bfc6e0079d2 SHA512 3c35af05ae71140069f0793df625e79764a78983a8cf56d47d3f71e2cffe0db58c352b8807cf9a8d237ae0d44ac0dc892f3e81280f98265889b83f8dbb53d10d
 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
 EBUILD libsmbios-2.4.3-r1.ebuild 2060 BLAKE2B a30e3b1e9fd39b89fb9394af63e7f239ce19ff53e09a29c815c43347af4c6452c5c632db9f7c8c377ed217abd4d3aa191bd87d8fae4fba57cd63d791a8dcce99 SHA512 7da4960bd0a8a94693d384fba1ad038d45a6ffb3f5ac85eadfa4d50f86a500577f234468aaaacf3ee673b0aeec1de3b9590b292b463aa832cbd4ea1fa183ed1f
-EBUILD libsmbios-2.4.3.ebuild 2006 BLAKE2B e131a9a873cd694bfa14f51d318bc5d46596172792cddbb45bf65cb5f3402cf1c150aa730fe5d8ba367792bc67597af74db3670c273ed1a3468bb28679979751 SHA512 fa64d73cd8cf08598e4b77893ee96d38755c95fdbda9c2eea40f091415808700df79d4b7fba6cfbfaa8e326d5dad68b5684fed1f8897b0f52c0bd416e3d8e660
 MISC metadata.xml 557 BLAKE2B ddf6dca94f4251cd83371a7dfd747cc10364e4e5defbe08fb8702db603c4b640d0c7057558de9c7a8dbabb9975ee53e2a255e438d17d6c0c83a457dc9cfbf995 SHA512 e8f88ee20d3cab058dc8d78f6d431c0dfa39cb538dfd242c605a524809300f7392c39f8aff96e3f84c77db412ab286a5f37fa6b5233961e41fde264aea8052c7
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
deleted file mode 100644
index dd4417be8270..000000000000
--- a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools flag-o-matic python-single-r1
-
-DESCRIPTION="Provide access to (SM)BIOS information"
-HOMEPAGE="https://github.com/dell/libsmbios"
-SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0"
-SLOT="0"
-KEYWORDS="-* amd64 ~ia64 x86"
-IUSE="doc graphviz nls +python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libxml2
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	graphviz? ( media-gfx/graphviz )
-	nls? ( sys-devel/gettext )"
-BDEPEND="test? (
-	${PYTHON_DEPS}
-	>=dev-util/cppunit-1.9.6
-)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
-	"${FILESDIR}/${PN}-2.4.3-avoid_bashisms.patch" #715202
-	"${FILESDIR}/${PN}-2.4.3-insecure_rpaths.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Don't build yum-plugin - we don't need it
-	sed '/yum-plugin/d' -i Makefile.am || die
-
-	if use test; then
-		python_fix_shebang src/pyunit/test*.py
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	#Remove -O3 for bug #290097
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable doc doxygen)
-		$(use_enable graphviz)
-		$(use_enable nls)
-		$(use_enable python)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	if use python; then
-		python_scriptinto /usr/sbin
-		python_doscript "${ED}"/usr/sbin/smbios-{{battery,keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
-	fi
-
-	insinto /usr/include/
-	doins -r src/include/smbios_c
-
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-	fi
-}