1 |
commit: d066f01a88012838931b5a8483a5391bb876dc50 |
2 |
Author: Naohiro Aota <naota <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 18:51:16 2011 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 18:51:16 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d066f01a |
7 |
|
8 |
dodoc: fix installation in EAPI=4 |
9 |
|
10 |
Look in the offset with ED. |
11 |
|
12 |
https://bugs.gentoo.org/show_bug.cgi?id=381125 |
13 |
|
14 |
--- |
15 |
bin/ebuild-helpers/doins | 4 ++-- |
16 |
1 files changed, 2 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins |
19 |
index b3a6a38..c91883b 100755 |
20 |
--- a/bin/ebuild-helpers/doins |
21 |
+++ b/bin/ebuild-helpers/doins |
22 |
@@ -70,8 +70,8 @@ _doins() { |
23 |
# $PORTAGE_ACTUAL_DISTDIR/. |
24 |
if [ $PRESERVE_SYMLINKS = y ] && \ |
25 |
! [[ $(readlink "$mysrc") == "$PORTAGE_ACTUAL_DISTDIR"/* ]] ; then |
26 |
- rm -rf "$D$INSDESTTREE/$mydir/${mysrc##*/}" || return $? |
27 |
- cp -P "$mysrc" "$D$INSDESTTREE/$mydir/${mysrc##*/}" |
28 |
+ rm -rf "$ED$INSDESTTREE/$mydir/${mysrc##*/}" || return $? |
29 |
+ cp -P "$mysrc" "$ED$INSDESTTREE/$mydir/${mysrc##*/}" |
30 |
return $? |
31 |
else |
32 |
cp "$mysrc" "$TMP/2/${mysrc##*/}" || return $? |