commit: 085098cf15168729f16bcc4fa735dab8aab5f33a Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 3 12:51:15 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Feb 3 12:51:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085098cf
dev-util/pkgcheck: fix for newer setuptools This new patch affects only the build system, so those that have pkgcheck already installed have no issues, but those trying to build it with newer setuptools will fail => no revbump is needed. Closes: https://bugs.gentoo.org/892938 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> .../files/pkgcheck-0.10.19-fix-setup.patch | 22 ++++++++++++++++++++++ dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild | 6 +++++- dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild | 3 ++- dev-util/pkgcheck/pkgcheck-0.10.20.ebuild | 1 + 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch new file mode 100644 index 000000000000..8366e435a1e9 --- /dev/null +++ b/dev-util/pkgcheck/files/pkgcheck-0.10.19-fix-setup.patch @@ -0,0 +1,22 @@ +https://github.com/pkgcore/pkgcheck/commit/b4c34a95f4c66db9c658f6dd75d9193c6e55dab4 + +--- a/setup.py ++++ b/setup.py +@@ -36,12 +36,12 @@ class build_treesitter(Command, SubCommand): + pass + + def get_source_files(self): +- cwd = Path(__file__).parent / "tree-sitter-bash/src" ++ src = "tree-sitter-bash/src/" + return [ +- str(cwd / "GNUmakefile"), +- str(cwd / "tree_sitter/parser.h"), +- str(cwd / "parser.c"), +- str(cwd / "scanner.cc"), ++ src + "GNUmakefile", ++ src + "tree_sitter/parser.h", ++ src + "parser.c", ++ src + "scanner.cc", + ] + + library_path = Path(__file__).parent / "src/pkgcheck/bash/lang.so" diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild index fdc0630f0197..0ead2a88c1b6 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -55,6 +55,10 @@ BDEPEND="${RDEPEND} ) " +PATCHES=( + "${FILESDIR}/${PN}-0.10.19-fix-setup.patch" +) + SITEFILE="50${PN}-gentoo.el" distutils_enable_tests pytest diff --git a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild index e8ce5bc43086..7bdb06bfcbfd 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.19-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -57,6 +57,7 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-fix-pkgcore-0.12.18.patch" + "${FILESDIR}/${PN}-0.10.19-fix-setup.patch" ) SITEFILE="50${PN}-gentoo.el" diff --git a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild index ee894bade2d1..ca8e001c8437 100644 --- a/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.10.20.ebuild @@ -57,6 +57,7 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-fix-replay-bin.patch" + "${FILESDIR}/${PN}-0.10.19-fix-setup.patch" ) SITEFILE="50${PN}-gentoo.el"
