--- trunk/include/python.sminc	2012/01/14 01:48:34	9880
+++ trunk/include/python.sminc	2014/03/06 08:40:01	21029
@@ -1,13 +1,17 @@
 # $Id$
 
+SDEPEND="${SDEPEND}
+	>= dev-lang/python-2.7"
+
 # get the major.minor current installed python version
 # -> ex 2.4
 get_python_version()
 {
-#	PYVER="$(python -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"
-	PYVER=$(python -c "import sys ; print sys.version[:3]")
-	[[ -z ${PYVER} ]] && return 1
-	echo "${PYVER}"
+	local pyver
+#	pyver="$(python -V 2>&1 | cut -d' ' -f2 | cut -d. -f1-2)"
+	pyver=$(python -c "import sys ; print sys.version[:3]")
+	[[ -z ${pyver} ]] && return 1
+	echo "${pyver}"
 	return 0
 }
 
@@ -15,6 +19,7 @@
 {
 	local pylib
 	pylib=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
+	[[ -z ${pylib} ]] && return 1
 	echo "${pylib}"
 	return 0
 }
@@ -23,6 +28,7 @@
 {
 	local pyinc
 	pyinc=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()')
+	[[ -z ${pyinc} ]] && return 1
 	echo "${pyinc}"
 	return 0
 }
@@ -75,6 +81,20 @@
 	python_docompile || die
 }
 
+python_multilib_src_compile()
+{
+	local abi
+	local saved_SRCDIR="${SRCDIR}"
+
+	for abi in ${MULTILIB_ABIS}
+	do
+		SRCDIR="${saved_SRCDIR}-${abi}/${SRCSUBDIR}"
+		cd ${SRCDIR}
+		abi-${abi} python_docompile || die
+	done
+	SRCDIR="${saved_SRCDIR}"
+}
+
 python_src_install()
 {
 	cd ${SRCDIR}
@@ -91,4 +111,34 @@
 	done
 }
 
-export_inherits python src_prepare src_compile src_install
+python_multilib_src_install()
+{
+	local abi
+	local saved_SRCDIR="${SRCDIR}"
+
+	for abi in ${MULTILIB_ABIS}
+	do
+		SRCDIR="${saved_SRCDIR}-${abi}/${SRCSUBDIR}"
+		cd ${SRCDIR}
+		abi-${abi} python_doinstall || die
+
+		local i
+		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
+			FAQ LICENSE NEWS README TODO
+		do
+			if [ -f ${SRCDIR}/${i} ]
+			then
+				oldminstalldocs ${i} || die
+			fi
+		done
+	done
+	SRCDIR="${saved_SRCDIR}"
+}
+
+export_inherits python src_prepare src_check
+if [[ ${MULTILIB_BUILD} = true ]]
+then
+	export_inherits python_multilib src_compile src_install
+else
+	export_inherits python src_compile src_install
+fi