--- trunk/include/pypi.sminc	2017/10/16 09:21:22	29841
+++ trunk/include/pypi.sminc	2017/10/16 09:52:30	29846
@@ -66,6 +66,17 @@
 	fi
 }
 
+pypi_multilib_src_prepare()
+{
+	if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
+	then
+		python2_multilib_src_prepare || die
+		python3_multilib_src_prepare || die
+	else
+		python_multilib_src_prepare || die
+	fi
+}
+
 pypi_src_compile()
 {
 	local configure_opts="$@"
@@ -79,6 +90,19 @@
 	fi
 }
 
+pypi_multilib_src_compile()
+{
+	local configure_opts="$@"
+
+	if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
+	then
+		python2_multilib_src_compile ${configure_opts} || die
+		python3_multilib_src_compile ${configure_opts} || die
+	else
+		python_multilib_src_compile ${configure_opts} || die
+	fi
+}
+
 pypi_src_install()
 {
 	python_src_install || die
@@ -94,26 +118,6 @@
 	python3_src_install || die
 }"
 
-pypi_multilib_src_compile()
-{
-	local configure_opts="$@"
-	python_multilib_src_compile ${configure_opts} || die
-
-}
-
-pypi_multilib_python2_src_compile()
-{
-	local configure_opts="$@"
-
-	if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
-	then
-		python2_multilib_src_compile ${configure_opts} || die
-		python3_multilib_src_compile ${configure_opts} || die
-	else
-		python_multilib_src_compile ${configure_opts} || die
-	fi
-}
-
 pypi_multilib_src_install()
 {
 	python_multilib_src_install || die
@@ -129,20 +133,19 @@
 	python3_multilib_src_install || die
 }"
 
-export_inherits pypi src_prepare
 if [[ ${MULTILIB_BUILD} = true ]]
 then
 	if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
 	then
-		export_inherits pypi_multilib src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
+		export_inherits pypi_multilib src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
 	else
-		export_inherits pypi_multilib src_compile src_install
+		export_inherits pypi_multilib src_prepare src_compile src_install
 	fi
 else
 	if [[ ${PYPI_MULTIPLE_PYTHON_VERSIONS} = 1 ]]
 	then
-		export_inherits pypi src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
+		export_inherits pypi src_prepare src_compile src_install_python2-${SPLIT_PNAME} src_install_python3-${SPLIT_PNAME}
 	else
-		export_inherits pypi src_compile src_install
+		export_inherits pypi src_prepare src_compile src_install
 	fi
 fi