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: Tue, 07 Jun 2022 06:55:27
Message-Id: 1654584827.4a3dc32bdafdc5b99cd5c9fd865c3cb40c5e054e.mgorny@gentoo
1 commit: 4a3dc32bdafdc5b99cd5c9fd865c3cb40c5e054e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 31 08:43:38 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 7 06:53:47 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3dc32b
7
8 distutils-r1.eclass: Remove the obsolete pypy/share check
9
10 The PyPy 'share' directory check was necessary because of the historical
11 prefix logic that we patched in Gentoo. All modern versions of PyPy
12 use '/usr' as sys.prefix natively, so the check is no longer needed.
13
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 eclass/distutils-r1.eclass | 12 ------------
17 1 file changed, 12 deletions(-)
18
19 diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
20 index 30391ad67f3a..b0318410b100 100644
21 --- a/eclass/distutils-r1.eclass
22 +++ b/eclass/distutils-r1.eclass
23 @@ -1839,18 +1839,6 @@ _distutils-r1_post_python_install() {
24 die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
25 fi
26 done
27 -
28 - local shopt_save=$(shopt -p nullglob)
29 - shopt -s nullglob
30 - local pypy_dirs=(
31 - "${D}${EPREFIX}/usr/$(get_libdir)"/pypy*/share
32 - "${D}${EPREFIX}/usr/lib"/pypy*/share
33 - )
34 - ${shopt_save}
35 -
36 - if [[ -n ${pypy_dirs} ]]; then
37 - die "Package installs 'share' in PyPy prefix, see bug #465546."
38 - fi
39 }
40
41 # @FUNCTION: _distutils-r1_check_namespace_pth