[gentoo-python] [PATCH distutils-r1 4/6] Install files to intermediate root and merge afterwards.

[Michał Górny]

This will allow us to install wrapper in distutils-r1_rename_scripts
without interfering with distutils' no-clobber behavior. In future it
will also make it possible to run install in parallel.
---
 gx86/eclass/distutils-r1.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index e1e89c6..fffa800 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -297,9 +297,14 @@ distutils-r1_python_install() {
 	local PYTHONDONTWRITEBYTECODE
 	export PYTHONDONTWRITEBYTECODE
 
-	esetup.py install "${flags[@]}" --root="${D}" "${@}"
+	local root=${D}/_${EPYTHON}
 
-	_distutils-r1_rename_scripts "${D}"
+	esetup.py install "${flags[@]}" --root="${root}" "${@}"
+	_distutils-r1_rename_scripts "${root}"
+
+	# merge
+	cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed."
+	rm -rf "${root}"
 }
 
 # @FUNCTION: distutils-r1_python_install_all
-- 
1.8.0