gentoo auto-resync : 07:09:2023 - 16:28:34

6 files changed, 140 insertions, 6 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d939ba87181a..96e515ea87e7 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index c7ea0348eb38..0abd00d0e6c4 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,7 +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
 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-9999.ebuild 2803 BLAKE2B 2f253de229e5d93466babc7ae69bcc121f7a2c8342f734b1fdc37f5e5f5243b609bb17ebe5d72d3d93885db662a9b6b55f7fa8188ac5f7d9ddf4421fb459f1f1 SHA512 8179778311125fed76869a7ef3a7658f77a71b368c84ee58441442f3b84587c64056ed2e4f7a57ab463eeefa230f42fee9e92cceee05e284e9c40e278bdf999d
+EBUILD libblockdev-3.0.3.ebuild 2931 BLAKE2B 1fa1c65096d35a95d28aba10dd2841a14e7834f040f61aa9b6eeadb27b72e474fc0990159a62695fbd851af176089a429546571c8ed16676051d964cd0700fab SHA512 389d13fda89a684c2e8f40766d8bf4c5565a3db9d4344f9251399873557874ddaa0f3b0fc4004eb75fa24d9ef5efeeb60e30df378b9ab00d92a7744de265023a
 MISC metadata.xml 1120 BLAKE2B 1a323b7d5b61c6404578f58a880ff7825f818d1efcdf3f78954959cab3906be29651320aad097af181f988b537b8997412c24fec958207b22921462287e8a8cd SHA512 d531b6b1c0fc2e5996b11a16c211c29daa05da580e92ddf01e0ca672dba032a1ce8c5c66c44fa36e10397eec8379690a7299f3dfd811c2a2a8d464af69b3c649
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild
index 59bd04d7fe4e..7d50d311061b 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-3.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools python-single-r1 xdg-utils
+inherit autotools python-single-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
 HOMEPAGE="https://github.com/storaged-project/libblockdev"
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999 ]] ; then
 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
 fi
 LICENSE="LGPL-2+"
 SLOT="0/3"	# subslot is SOVERSION
@@ -48,11 +48,12 @@ RDEPEND="
 	)
 	nvme? ( sys-libs/libnvme )
 	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
 "
 
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 BDEPEND+="
 	dev-util/gtk-doc-am
@@ -85,6 +86,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Bug #910487
+	if tc-ld-is-lld; then
+		tc-ld-force-bfd
+	fi
+
 	local myeconfargs=(
 		--with-btrfs
 		--with-fs
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index 2c7e66f58d38..dc2647d1153e 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,6 +1,8 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
 AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3
 AUX libsmbios-2.4.3-insecure_rpaths.patch 536 BLAKE2B 7f5e307002b4898665ee2355287e1512d381168e53d1b56a8ef5ebbb503492f49b27c5fe27b53db7c5005f13559b5f0576ba14041436d0f67c172299ddc31877 SHA512 7d1f64d1a9966882a8df31abd5566f07f7fe01cede6ee1140c9b44aa47464efe53997c92ec423228114d568c4cfd77309e4a3dd7d9294fa09b054d72838143da
+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 2062 BLAKE2B 7023dbf369126127b4f3a282255347b56b7d2d678d5216c52d347e6a88e2afa77814ad54f0547ed15f14ea78052f5ab88e762305d02815b7ceee15c6c8a7603a SHA512 74e3629488146bf8f7bc7d059af3e8fe3b99971217dca428ac9298eef563331d03acad938bd8ff58fe3a14e05e2205b2001a2c82cb85feb1473059483961270a
 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/files/libsmbios-2.4.3-python-deprecations.patch b/sys-libs/libsmbios/files/libsmbios-2.4.3-python-deprecations.patch
new file mode 100644
index 000000000000..c67df620e85f
--- /dev/null
+++ b/sys-libs/libsmbios/files/libsmbios-2.4.3-python-deprecations.patch
@@ -0,0 +1,33 @@
+From 99e0ac359d55d7a66d944e038ad63a7f6ef6698d Mon Sep 17 00:00:00 2001
+From: troy <70726977+troygraben@users.noreply.github.com>
+Date: Mon, 26 Jul 2021 17:05:35 -0400
+Subject: [PATCH] Fix the TokenTable generator implementation
+
+This change supports PEP 479 by changing the generator to use return
+instead of raising StopIteration.
+
+This fixes the RuntimeError exception being raised with Python 3.7 and
+newer when the iterator reaches the end of the collection. This could be
+encountered when calling smbios-token-ctl --dump-tokens
+--- a/src/bin/smbios-token-ctl
++++ b/src/bin/smbios-token-ctl
+@@ -427,8 +427,6 @@ def main():
+         verboseLog.info( _("The token library returned this error:") )
+         verboseLog.info( str(e) )
+         moduleLog.info( cli.standardFailMessage )
+-    except StopIteration:
+-        pass
+ 
+     return exit_code
+ 
+--- a/src/python/libsmbios_c/smbios_token.py
++++ b/src/python/libsmbios_c/smbios_token.py
+@@ -131,7 +131,7 @@ def __iter__(self):
+             if bool(cur):
+                 yield cur.contents
+             else:
+-                raise StopIteration
++                return
+ 
+     @traceLog()
+     def __getitem__(self, id):
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild
new file mode 100644
index 000000000000..e1bb901b8e36
--- /dev/null
+++ b/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{10..12} )
+
+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"
+	"${FILESDIR}"/${PN}-2.4.3-python-deprecations.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
+}