[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     7e20289625d5fd9589d050b41a60bf8819238dde
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 13:11:35 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 13:12:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e202896

distutils-r1.eclass: Fix pypy prefix check for new paths

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/distutils-r1.eclass | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index fa7a3ab5c12..66920d1f755 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -597,7 +597,16 @@ distutils-r1_python_install() {
                        die "Package installs '${p}' package which is forbidden 
and likely a bug in the build system."
                fi
        done
-       if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
+
+       local shopt_save=$(shopt -p nullglob)
+       shopt -s nullglob
+       local pypy_dirs=(
+               "${root}/usr/$(get_libdir)"/pypy*/share
+               "${root}/usr/lib"/pypy*/share
+       )
+       ${shopt_save}
+
+       if [[ -n ${pypy_dirs} ]]; then
                local cmd=die
                [[ ${EAPI} == [45] ]] && cmd=eqawarn
                "${cmd}" "Package installs 'share' in PyPy prefix, see bug 
#465546."