--- trunk/include/python.sminc	2014/03/06 08:40:01	21029
+++ trunk/include/python.sminc	2017/10/11 11:03:03	29782
@@ -1,38 +1,65 @@
 # $Id$
 
-SDEPEND="${SDEPEND}
-	>= dev-lang/python-2.7"
+# simulate the old behavior
+if [[ -z ${MAGE_PYTHON_EXEC} ]]
+then
+	MAGE_PYTHON_EXEC="python"
+
+	SDEPEND="${SDEPEND}
+		>= dev-lang/python-2.7"
+fi
+if [[ -z ${MAGE_PYTHON_BUILD_VERSIONS} ]]
+then
+	MAGE_PYTHON_BUILD_VERSIONS="single"
+fi
 
 # get the major.minor current installed python version
 # -> ex 2.4
-get_python_version()
+mget-python-version()
 {
 	local pyver
-#	pyver="$(python -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"
-	pyver=$(python -c "import sys ; print sys.version[:3]")
+#	pyver="$(${MAGE_PYTHON_EXEC} -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"
+	pyver=$(${MAGE_PYTHON_EXEC} -c "import sys ; (print sys.version[:3])")
 	[[ -z ${pyver} ]] && return 1
 	echo "${pyver}"
 	return 0
 }
 
-get_python_libdir()
+mget-python-libdir()
 {
 	local pylib
-	pylib=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+	pylib=$(${MAGE_PYTHON_EXEC} -c 'from distutils import sysconfig; print (sysconfig.get_python_lib())')
 	[[ -z ${pylib} ]] && return 1
 	echo "${pylib}"
 	return 0
 }
 
-get_python_includedir()
+mget-python-includedir()
 {
 	local pyinc
-	pyinc=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()')
+	pyinc=$(${MAGE_PYTHON_EXEC} -c 'from distutils import sysconfig; print (sysconfig.get_python_inc())')
 	[[ -z ${pyinc} ]] && return 1
 	echo "${pyinc}"
 	return 0
 }
 
+# fallback functions to support old smage scripts, dropped in near future
+get_python_version()
+{
+	echo -e "${COLYELLOW}Warning: get_python_version() is depcrecated, please use mget-python-version() instead${COLDEFAULT}" >&2
+	mget-python-version
+}
+get_python_libdir()
+{
+	echo -e "${COLYELLOW}Warning: get_python_libdir() is depcrecated, please use mget-python-libdir() instead${COLDEFAULT}" >&2
+	mget-python-libdir
+}
+get_python_includedir()
+{
+	echo -e "${COLYELLOW}Warning: get_python_includedir() is depcrecated, please use mget-python-includedir() instead${COLDEFAULT}" >&2
+	mget-python-includedir
+}
+
 python_src_prepare()
 {
 	munpack ${SRCFILE} || die
@@ -42,11 +69,11 @@
 {
 	if [[ -e setup.py ]]
 	then
-		python setup.py build $@ || die
+		${MAGE_PYTHON_EXEC} setup.py build $@ || die
 	elif [[ -e waf ]]
 	then
-		python waf configure --prefix=/usr --libdir=/usr/$(mlibdir) $@ || die
-		python waf build $@ || die
+		${MAGE_PYTHON_EXEC} waf configure --prefix=/usr --libdir=/usr/$(mlibdir) $@ || die
+		${MAGE_PYTHON_EXEC} waf build $@ || die
 	elif [[ -e configure ]]
 	then
 		mconfigure $@ || die
@@ -63,13 +90,13 @@
 {
 	if [[ -e setup.py ]]
 	then
-		python setup.py install --no-compile --root ${BINDIR} $@ || die
+		${MAGE_PYTHON_EXEC} setup.py install --no-compile --root ${BINDIR} $@ || die
 	elif [[ -e waf ]]
 	then
-		python waf install --destdir=${BINDIR} $@ || die
+		${MAGE_PYTHON_EXEC} waf install --destdir=${BINDIR} $@ || die
 	elif [[ -e install.py ]]
 	then
-		python install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die
+		${MAGE_PYTHON_EXEC} install.py --prefix=/usr --files-only --destdir=${BINDIR} $@ || die
 	else
 		mmake DESTDIR=${BINDIR} install || die
 	fi
@@ -78,7 +105,7 @@
 python_src_compile()
 {
 	cd ${SRCDIR}
-	python_docompile || die
+	python_docompile $@ || die
 }
 
 python_multilib_src_compile()
@@ -90,15 +117,20 @@
 	do
 		SRCDIR="${saved_SRCDIR}-${abi}/${SRCSUBDIR}"
 		cd ${SRCDIR}
-		abi-${abi} python_docompile || die
+		abi-${abi} python_docompile $@ || die
 	done
 	SRCDIR="${saved_SRCDIR}"
 }
 
+python_src_check()
+{
+	return 0
+}
+
 python_src_install()
 {
 	cd ${SRCDIR}
-	python_doinstall || die
+	python_doinstall $@ || die
 
 	local i
 	for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
@@ -120,7 +152,7 @@
 	do
 		SRCDIR="${saved_SRCDIR}-${abi}/${SRCSUBDIR}"
 		cd ${SRCDIR}
-		abi-${abi} python_doinstall || die
+		abi-${abi} python_doinstall $@ || die
 
 		local i
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \