Fixes #23881

svn path=/; revision=34

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 6f1bc41f9115c38704367cdfaef0eab3d44c02ed..99cf606fc7579625678a160174e04168e1a4c3f6 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,4 +1,7 @@
-
+       
+2003-06-27 Karl Trygve Kalleberg <karltk@gentoo.org>
+       * Added patch to echangelog to consider PORTDIR, fixes #23881.
+       
 2003-06-26 Karl Trygve Kalleberg <karltk@gentoo.org>
        * Added echangelog, by agenkin
        * Added ekeyword, by agenkin

diff --git a/trunk/src/echangelog/echangelog b/trunk/src/echangelog/echangelog
index f9fcba12629c1c1735c4b8757c1b667592e484b6..a893e27884a2c5bdd78eaf9cc97da5a50a965af9 100644 (file)
--- a/trunk/src/echangelog/echangelog
+++ b/trunk/src/echangelog/echangelog
@@ -30,8 +30,10 @@ if (-f 'ChangeLog') {
 } else {
     # No ChangeLog here, maybe we should make one...
     if (<*.ebuild>) {
-        open I, '<../../skel.ChangeLog' 
-            or die "Can't open ../../skel.ChangeLog for input: $!\n";
+        my ($portdir) = `/usr/bin/portageq portdir 2>/dev/null`;
+        chomp($portdir);
+        open I, "<$portdir/skel.ChangeLog"
+            or die "Can't open $portdir/skel.ChangeLog for input: $!\n";
         { local $/ = undef; $text = <I>; }
         close I;
         my ($cwd) = getcwd();