Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 453800
Collapse All | Expand All

(-)python.eclass.orig (-2 / +2 lines)
Lines 1661-1669 Link Here
1661
		# the 3-way structure per comment #6. This enable users with old
1661
		# the 3-way structure per comment #6. This enable users with old
1662
		# coreutils to upgrade a lot easier (you need to upgrade python+portage
1662
		# coreutils to upgrade a lot easier (you need to upgrade python+portage
1663
		# before coreutils can be upgraded).
1663
		# before coreutils can be upgraded).
1664
		if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1664
		if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90' && use userland_GNU; then
1665
			cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1665
			cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1666
		elif ROOT="/" has_version sys-apps/coreutils; then
1666
		elif ROOT="/" has_version sys-apps/coreutils && use userland_GNU; then
1667
			cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1667
			cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1668
		else
1668
		else
1669
			cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1669
			cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"

Return to bug 453800