From 3e741a8c5f0827722b34196cec2f0452ad6403fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sun, 28 Apr 2024 02:12:04 +0200 Subject: [PATCH] [dev-db/mongodb] support py3k12 --- .../mongodb/files/mongodb-4.4.29-py3k12.patch | 25 +++++++++++++++++++ dev-db/mongodb/mongodb-4.4.29.ebuild | 3 ++- dev-db/mongodb/mongodb-5.0.26.ebuild | 3 ++- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 dev-db/mongodb/files/mongodb-4.4.29-py3k12.patch diff --git a/dev-db/mongodb/files/mongodb-4.4.29-py3k12.patch b/dev-db/mongodb/files/mongodb-4.4.29-py3k12.patch new file mode 100644 index 0000000..8baf64c --- /dev/null +++ b/dev-db/mongodb/files/mongodb-4.4.29-py3k12.patch @@ -0,0 +1,25 @@ + buildscripts/moduleconfig.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/buildscripts/moduleconfig.py b/buildscripts/moduleconfig.py +index b4d0bba0490..f59ddd7bc5c 100644 +--- a/buildscripts/moduleconfig.py ++++ b/buildscripts/moduleconfig.py +@@ -27,7 +27,7 @@ MongoDB SConscript files do. + __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules', + 'register_module_test') # pylint: disable=undefined-all-variable + +-import imp ++import importlib + import inspect + import os + +@@ -71,7 +71,7 @@ def discover_modules(module_root, allowed_modules): + print("adding module: %s" % (name)) + fp = open(build_py, "r") + try: +- module = imp.load_module("module_" + name, fp, build_py, ++ module = importlib.load_module("module_" + name, fp, build_py, + (".py", "r", imp.PY_SOURCE)) + if getattr(module, "name", None) is None: + module.name = name \ No newline at end of file diff --git a/dev-db/mongodb/mongodb-4.4.29.ebuild b/dev-db/mongodb/mongodb-4.4.29.ebuild index c00ae32..f43cdfe 100644 --- a/dev-db/mongodb/mongodb-4.4.29.ebuild +++ b/dev-db/mongodb/mongodb-4.4.29.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) SCONS_MIN_VERSION="3.3.1" CHECKREQS_DISK_BUILD="2400M" @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.4.10-boost-1.79.patch" "${FILESDIR}/${PN}-4.4.10-no-force-lld.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" + "${FILESDIR}/${P}-py3k12.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/dev-db/mongodb/mongodb-5.0.26.ebuild b/dev-db/mongodb/mongodb-5.0.26.ebuild index feb1804..710e8e6 100644 --- a/dev-db/mongodb/mongodb-5.0.26.ebuild +++ b/dev-db/mongodb/mongodb-5.0.26.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) SCONS_MIN_VERSION="3.3.1" CHECKREQS_DISK_BUILD="2400M" @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" + "${FILESDIR}/${PN}-4.4.29-py3k12.patch" ) S="${WORKDIR}/${MY_P}"