commit: 860545583727daf8489d1c40c77d92715bc374b5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue May 13 01:04:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 13 01:04:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86054558
sys-libs/libsmbios: EAPI 8, enable py3.13 + py3.14, modernise Closes: https://bugs.gentoo.org/952746 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libsmbios-2.4.3-python-3.13.patch | 30 +++++++++++++++ ...s-2.4.3-r1.ebuild => libsmbios-2.4.3-r2.ebuild} | 44 +++++++++++++--------- 2 files changed, 56 insertions(+), 18 deletions(-) diff --git a/sys-libs/libsmbios/files/libsmbios-2.4.3-python-3.13.patch b/sys-libs/libsmbios/files/libsmbios-2.4.3-python-3.13.patch new file mode 100644 index 000000000000..5dc84cacd3af --- /dev/null +++ b/sys-libs/libsmbios/files/libsmbios-2.4.3-python-3.13.patch @@ -0,0 +1,30 @@ +https://github.com/dell/libsmbios/pull/149 + +From 2c29293ed6a713254192c6f6c762a0ed82391ed5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta?= <[email protected]> +Date: Thu, 30 Jan 2025 12:19:49 +0100 +Subject: [PATCH] drop unittest.makeSuite (dropped in python 3.13) + +--- + src/pyunit/TestLib.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/pyunit/TestLib.py b/src/pyunit/TestLib.py +index 561453b2..e420990a 100755 +--- a/src/pyunit/TestLib.py ++++ b/src/pyunit/TestLib.py +@@ -21,12 +21,10 @@ def parseOptions(*args): + pass + + def runTests( testCase ): +- testToRun = 'test' +- + myTestSuite = unittest.TestSuite() + for i in testCase: + try: +- temp = unittest.makeSuite( i, testToRun ) ++ temp = unittest.defaultTestLoader.loadTestsFromTestCase( i ) + myTestSuite.addTest(temp) + except ValueError: + pass + diff --git a/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3-r2.ebuild similarity index 73% rename from sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild rename to sys-libs/libsmbios/libsmbios-2.4.3-r2.ebuild index e69b60826006..e9318ffb7da1 100644 --- a/sys-libs/libsmbios/libsmbios-2.4.3-r1.ebuild +++ b/sys-libs/libsmbios/libsmbios-2.4.3-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{10..12} ) +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) inherit autotools flag-o-matic python-single-r1 @@ -14,30 +15,36 @@ LICENSE="|| ( GPL-2+ OSL-2.1 ) BSD Boost-1.0" SLOT="0" KEYWORDS="-* amd64 x86" IUSE="doc graphviz nls +python static-libs test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} )" - +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( ${PYTHON_REQUIRED_USE} ) +" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libxml2 +RDEPEND=" + dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig doc? ( app-text/doxygen ) graphviz? ( media-gfx/graphviz ) - nls? ( sys-devel/gettext )" -BDEPEND="test? ( - ${PYTHON_DEPS} - >=dev-util/cppunit-1.9.6 -)" + nls? ( sys-devel/gettext ) + 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-avoid_bashisms.patch" # bug #715202 "${FILESDIR}/${PN}-2.4.3-insecure_rpaths.patch" - "${FILESDIR}"/${PN}-2.4.3-python-deprecations.patch + "${FILESDIR}/${PN}-2.4.3-python-deprecations.patch" + "${FILESDIR}/${PN}-2.4.3-python-3.13.patch" ) pkg_setup() { @@ -60,7 +67,7 @@ src_prepare() { } src_configure() { - #Remove -O3 for bug #290097 + # Remove -O3 for bug #290097 replace-flags -O3 -O2 local myeconfargs=( @@ -70,6 +77,7 @@ src_configure() { $(use_enable python) $(use_enable static-libs static) ) + econf "${myeconfargs[@]}" } @@ -86,7 +94,7 @@ src_install() { einstalldocs - if ! use static-libs ; then + if ! use static-libs; then find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die fi }
