Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 11 May 2022 16:43:56
Message-Id: 1652287425.b30790dc30bed3063d72fc0a86a1743ef816c443.mgorny@gentoo
1 commit: b30790dc30bed3063d72fc0a86a1743ef816c443
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 10 16:37:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed May 11 16:43:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30790dc
7
8 distutils-r1.eclass: Update license stripping for hatch
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 eclass/distutils-r1.eclass | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
16 index 0962ef5e2356..ed368da79896 100644
17 --- a/eclass/distutils-r1.eclass
18 +++ b/eclass/distutils-r1.eclass
19 @@ -1277,9 +1277,12 @@ distutils_pep517_install() {
20 die "Wheel install failed"
21
22 # remove installed licenses
23 - find "${root}$(python_get_sitedir)" \
24 - '(' -path '*.dist-info/COPYING*' -o \
25 - -path '*.dist-info/LICENSE*' ')' -delete || die
26 + find "${root}$(python_get_sitedir)" -depth \
27 + \( -path '*.dist-info/COPYING*' \
28 + -o -path '*.dist-info/LICENSE*' \
29 + -o -path '*.dist-info/license_files/*' \
30 + -o -path '*.dist-info/license_files' \
31 + \) -delete || die
32
33 # clean the build tree; otherwise we may end up with PyPy3
34 # extensions duplicated into CPython dists