Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-util/afdko/, dev-util/afdko/files/
Date: Sat, 26 Mar 2022 11:53:55
Message-Id: 1648282068.33f2b788d6a179aa65e6ab134941f74e52d4e47f.andrewammerlaan@gentoo
1 commit: 33f2b788d6a179aa65e6ab134941f74e52d4e47f
2 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
3 AuthorDate: Sat Mar 26 08:07:48 2022 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 26 08:07:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=33f2b788
7
8 dev-util/afdko: prevent pip from installing cmake, ninja
9
10 Closes: https://bugs.gentoo.org/836146
11 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
12
13 dev-util/afdko/afdko-3.8.1.ebuild | 5 ++++-
14 dev-util/afdko/files/afdko-3.8.1-no-cmake-ninja-deps.patch | 13 +++++++++++++
15 2 files changed, 17 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-util/afdko/afdko-3.8.1.ebuild b/dev-util/afdko/afdko-3.8.1.ebuild
18 index 41dbb34df..99fcfd6e8 100644
19 --- a/dev-util/afdko/afdko-3.8.1.ebuild
20 +++ b/dev-util/afdko/afdko-3.8.1.ebuild
21 @@ -51,7 +51,10 @@ BDEPEND="
22
23 DOCS=( {README,NEWS}.md docs )
24
25 -PATCHES=( "${FILESDIR}/${PN}-3.6.2-_get_scripts-to-data_files.patch" )
26 +PATCHES=(
27 + "${FILESDIR}/${PN}-3.6.2-_get_scripts-to-data_files.patch"
28 + "${FILESDIR}/${P}-no-cmake-ninja-deps.patch"
29 +)
30
31 distutils_enable_tests pytest
32
33
34 diff --git a/dev-util/afdko/files/afdko-3.8.1-no-cmake-ninja-deps.patch b/dev-util/afdko/files/afdko-3.8.1-no-cmake-ninja-deps.patch
35 new file mode 100644
36 index 000000000..bd9367d86
37 --- /dev/null
38 +++ b/dev-util/afdko/files/afdko-3.8.1-no-cmake-ninja-deps.patch
39 @@ -0,0 +1,13 @@
40 +--- a/pyproject.toml
41 ++++ b/pyproject.toml
42 +@@ -3,9 +3,7 @@
43 + "setuptools",
44 + "wheel",
45 + "setuptools_scm",
46 +- "scikit-build",
47 +- "cmake",
48 +- "ninja"
49 ++ "scikit-build"
50 + ]
51 + build-backend = "setuptools.build_meta"
52 +