commit: e0dec3d48e60d0f4d1e19a0da482933394639649 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Mon Apr 15 17:28:06 2024 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Apr 15 17:43:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dec3d4
app-admin/webapp-config: enable py3.12 Closes: https://bugs.gentoo.org/929277 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../webapp-config-1.55-py3.122-invalid-escape-sequence.patch | 11 +++++++++++ ...webapp-config-9999.ebuild => webapp-config-1.55-r4.ebuild} | 8 ++++++-- app-admin/webapp-config/webapp-config-9999.ebuild | 8 ++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch new file mode 100644 index 000000000000..cb1ba1a8593e --- /dev/null +++ b/app-admin/webapp-config/files/webapp-config-1.55-py3.122-invalid-escape-sequence.patch @@ -0,0 +1,11 @@ +--- a/WebappConfig/protect.py ++++ b/WebappConfig/protect.py +@@ -78,7 +78,7 @@ + + numbers = [] + prefix = self.protect_prefix +- rep = re.compile(prefix.replace('.','\.') + '(\d{4})_') ++ rep = re.compile(prefix.replace('.',r'\.') + r'(\d{4})_') + + for i in entries: + rem = rep.match(i) diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild similarity index 93% copy from app-admin/webapp-config/webapp-config-9999.ebuild copy to app-admin/webapp-config/webapp-config-1.55-r4.ebuild index 76caefb23e6d..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-1.55-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == 9999* ]]; then diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild index 76caefb23e6d..cc2e8028b578 100644 --- a/app-admin/webapp-config/webapp-config-9999.ebuild +++ b/app-admin/webapp-config/webapp-config-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 prefix @@ -29,6 +29,10 @@ DEPEND="app-text/xmlto RDEPEND=" portage? ( sys-apps/portage[${PYTHON_USEDEP}] )" +PATCHES=( + "${FILESDIR}"/webapp-config-1.55-py3.122-invalid-escape-sequence.patch +) + python_prepare_all() { # make the source from svn mirror the one in the tarball if [[ ${PV} == 9999* ]]; then
