From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 16 Feb 2019 13:11:35 +0000 (+0100)
Subject: distutils-r1.eclass: Fix pypy prefix check for new paths
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e20289625d5fd9589d050b41a60bf8819238dde;p=gentoo.git

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

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index fa7a3ab5c12b..66920d1f7553 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."