| 1 |
mgorny 12/12/30 14:17:29 |
| 2 |
|
| 3 |
Modified: ChangeLog python-utils-r1.eclass |
| 4 |
Log: |
| 5 |
Fix installing scripts & modules for Prefix, bug #448786. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.581 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.580&r2=1.581 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.580 |
| 18 |
retrieving revision 1.581 |
| 19 |
diff -u -r1.580 -r1.581 |
| 20 |
--- ChangeLog 29 Dec 2012 17:47:53 -0000 1.580 |
| 21 |
+++ ChangeLog 30 Dec 2012 14:17:29 -0000 1.581 |
| 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.580 2012/12/29 17:47:53 hd_brummy Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 30 Dec 2012; Michał Górny <mgorny@g.o> python-utils-r1.eclass: |
| 29 |
+ Fix installing scripts & modules for Prefix, bug #448786. |
| 30 |
|
| 31 |
29 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> vdr-plugin-2.eclass: |
| 32 |
some adaption for new makefile handling, >=vdr-1.7.34 |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.11 eclass/python-utils-r1.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.10&r2=1.11 |
| 41 |
|
| 42 |
Index: python-utils-r1.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v |
| 45 |
retrieving revision 1.10 |
| 46 |
retrieving revision 1.11 |
| 47 |
diff -u -r1.10 -r1.11 |
| 48 |
--- python-utils-r1.eclass 27 Dec 2012 22:56:53 -0000 1.10 |
| 49 |
+++ python-utils-r1.eclass 30 Dec 2012 14:17:29 -0000 1.11 |
| 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/python-utils-r1.eclass,v 1.10 2012/12/27 22:56:53 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.11 2012/12/30 14:17:29 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: python-utils-r1 |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -490,10 +490,10 @@ |
| 59 |
|
| 60 |
debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}" |
| 61 |
newins "${f}" "${newfn}" || die |
| 62 |
- _python_rewrite_shebang "${D}/${d}/${newfn}" |
| 63 |
+ _python_rewrite_shebang "${ED}/${d}/${newfn}" |
| 64 |
|
| 65 |
# install the wrapper |
| 66 |
- _python_ln_rel "${ED}"/usr/bin/python-exec "${D}/${d}/${oldfn}" || die |
| 67 |
+ _python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die |
| 68 |
done |
| 69 |
} |
| 70 |
|
| 71 |
@@ -501,7 +501,7 @@ |
| 72 |
# @DEFAULT_UNSET |
| 73 |
# @DESCRIPTION: |
| 74 |
# The current module root for python_domodule(). The path can be either |
| 75 |
-# an absolute system path (it must start with a slash, and ${D} will be |
| 76 |
+# an absolute system path (it must start with a slash, and ${ED} will be |
| 77 |
# prepended to it) or relative to the implementation's site-packages directory |
| 78 |
# (then it must start with a non-slash character). |
| 79 |
# |
| 80 |
@@ -561,7 +561,7 @@ |
| 81 |
local PYTHON_SITEDIR=${PYTHON_SITEDIR} |
| 82 |
[[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR |
| 83 |
|
| 84 |
- d=${PYTHON_SITEDIR}/${python_moduleroot} |
| 85 |
+ d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot} |
| 86 |
fi |
| 87 |
|
| 88 |
local INSDESTTREE |
| 89 |
@@ -569,7 +569,7 @@ |
| 90 |
insinto "${d}" |
| 91 |
doins -r "${@}" || die |
| 92 |
|
| 93 |
- python_optimize "${D}/${d}" |
| 94 |
+ python_optimize "${ED}/${d}" |
| 95 |
} |
| 96 |
|
| 97 |
_PYTHON_UTILS_R1=1 |
Archives