| 1 |
mgorny 12/12/01 10:52:41 |
| 2 |
|
| 3 |
Modified: ChangeLog distutils-r1.eclass |
| 4 |
Log: |
| 5 |
Use intermediate-root install. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.535 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.535&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.535&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.534&r2=1.535 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.534 |
| 18 |
retrieving revision 1.535 |
| 19 |
diff -u -r1.534 -r1.535 |
| 20 |
--- ChangeLog 1 Dec 2012 10:51:48 -0000 1.534 |
| 21 |
+++ ChangeLog 1 Dec 2012 10:52:40 -0000 1.535 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.534 2012/12/01 10:51:48 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.535 2012/12/01 10:52:40 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 01 Dec 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 29 |
+ Use intermediate-root install. |
| 30 |
|
| 31 |
01 Dec 2012; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 32 |
Make distutils-r1_rename_scripts private. Rename all matching executables |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.22 eclass/distutils-r1.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.22&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.22&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.21&r2=1.22 |
| 41 |
|
| 42 |
Index: distutils-r1.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v |
| 45 |
retrieving revision 1.21 |
| 46 |
retrieving revision 1.22 |
| 47 |
diff -u -r1.21 -r1.22 |
| 48 |
--- distutils-r1.eclass 1 Dec 2012 10:51:48 -0000 1.21 |
| 49 |
+++ distutils-r1.eclass 1 Dec 2012 10:52:40 -0000 1.22 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.21 2012/12/01 10:51:48 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.22 2012/12/01 10:52:40 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: distutils-r1 |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -297,9 +297,14 @@ |
| 59 |
local PYTHONDONTWRITEBYTECODE |
| 60 |
export PYTHONDONTWRITEBYTECODE |
| 61 |
|
| 62 |
- esetup.py install "${flags[@]}" --root="${D}" "${@}" |
| 63 |
+ local root=${D}/_${EPYTHON} |
| 64 |
|
| 65 |
- _distutils-r1_rename_scripts "${D}" |
| 66 |
+ esetup.py install "${flags[@]}" --root="${root}" "${@}" |
| 67 |
+ _distutils-r1_rename_scripts "${root}" |
| 68 |
+ |
| 69 |
+ # merge |
| 70 |
+ cp -a -l -n "${root}"/* "${D}"/ || die "Merging ${EPYTHON} image failed." |
| 71 |
+ rm -rf "${root}" |
| 72 |
} |
| 73 |
|
| 74 |
# @FUNCTION: distutils-r1_python_install_all |
Archives