| 1 |
djc 11/07/04 10:59:26 |
| 2 |
|
| 3 |
Modified: python.eclass |
| 4 |
Log: |
| 5 |
Support EAPI >=4 in python_src_install(). |
| 6 |
(Patch by Arfrever. Backported from python overlay.) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.113 eclass/python.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.113&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?rev=1.113&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.eclass?r1=1.112&r2=1.113 |
| 14 |
|
| 15 |
Index: python.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
| 18 |
retrieving revision 1.112 |
| 19 |
retrieving revision 1.113 |
| 20 |
diff -u -r1.112 -r1.113 |
| 21 |
--- python.eclass 4 Jul 2011 10:50:28 -0000 1.112 |
| 22 |
+++ python.eclass 4 Jul 2011 10:59:25 -0000 1.113 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.112 2011/07/04 10:50:28 djc Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.113 2011/07/04 10:59:25 djc Exp $ |
| 28 |
|
| 29 |
# @ECLASS: python.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -602,7 +602,7 @@ |
| 32 |
python_copy_sources |
| 33 |
} |
| 34 |
|
| 35 |
- for python_default_function in src_configure src_compile src_test src_install; do |
| 36 |
+ for python_default_function in src_configure src_compile src_test; do |
| 37 |
eval "python_${python_default_function}() { |
| 38 |
_python_check_python_pkg_setup_execution |
| 39 |
|
| 40 |
@@ -615,6 +615,26 @@ |
| 41 |
done |
| 42 |
unset python_default_function |
| 43 |
|
| 44 |
+ python_src_install() { |
| 45 |
+ if ! _python_package_supporting_installation_for_multiple_python_abis; then |
| 46 |
+ die "${FUNCNAME}() cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" |
| 47 |
+ fi |
| 48 |
+ |
| 49 |
+ _python_check_python_pkg_setup_execution |
| 50 |
+ |
| 51 |
+ if has "${EAPI:-0}" 0 1 2 3; then |
| 52 |
+ python_execute_function -d -s -- "$@" |
| 53 |
+ else |
| 54 |
+ python_installation() { |
| 55 |
+ emake DESTDIR="${T}/images/${PYTHON_ABI}" install "$@" |
| 56 |
+ } |
| 57 |
+ python_execute_function -s python_installation "$@" |
| 58 |
+ unset python_installation |
| 59 |
+ |
| 60 |
+ python_merge_intermediate_installation_images "${T}/images" |
| 61 |
+ fi |
| 62 |
+ } |
| 63 |
+ |
| 64 |
if [[ -n "${PYTHON_EXPORT_PHASE_FUNCTIONS}" ]]; then |
| 65 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install |
| 66 |
fi |
Archives