From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 20 Mar 2020 08:07:19 +0000 (+0100)
Subject: distutils-r1.eclass: Replace python_export with getter
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1718e9ce001799f97401a58877dced6ac232eb38;p=gentoo.git

distutils-r1.eclass: Replace python_export with getter

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 114ccc8041cc..fd6c0193d12e 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -771,13 +771,11 @@ _distutils-r1_wrap_scripts() {
 	local path=${1}
 	local bindir=${2}
 
-	local PYTHON_SCRIPTDIR
-	python_export PYTHON_SCRIPTDIR
-
+	local scriptdir=$(python_get_scriptdir)
 	local f python_files=() non_python_files=()
 
-	if [[ -d ${path}${PYTHON_SCRIPTDIR} ]]; then
-		for f in "${path}${PYTHON_SCRIPTDIR}"/*; do
+	if [[ -d ${path}${scriptdir} ]]; then
+		for f in "${path}${scriptdir}"/*; do
 			[[ -d ${f} ]] && die "Unexpected directory: ${f}"
 			debug-print "${FUNCNAME}: found executable at ${f#${path}/}"