Add echangelog svn changes to the sunrise overlay, bug 136048

svn path=/; revision=7

3 files changed, 88 insertions, 0 deletions

diff --git a/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.5 b/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.5
new file mode 100644
index 000000000..93422271c
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.5
@@ -0,0 +1 @@
+MD5 5112aee2817041e3c2e94866fbb94277 gentoolkit-dev-0.2.5.tar.gz 45492
diff --git a/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.6.1 b/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.6.1
new file mode 100644
index 000000000..e075e73e1
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/digest-gentoolkit-dev-0.2.6.1
@@ -0,0 +1,3 @@
+MD5 769e6fa70c56e56ecd131a510aacc6b9 gentoolkit-dev-0.2.6.1.tar.gz 47324
+RMD160 a65b7ce89977406c707796ea686b4caca4392799 gentoolkit-dev-0.2.6.1.tar.gz 47324
+SHA256 469df57c1457eaa8b79d4d31f2aec05bfa1ad93407e0000d606f671010e6d544 gentoolkit-dev-0.2.6.1.tar.gz 47324
diff --git a/app-portage/gentoolkit-dev/files/echangelog-svn.diff b/app-portage/gentoolkit-dev/files/echangelog-svn.diff
new file mode 100644
index 000000000..15615fb0a
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/echangelog-svn.diff
@@ -0,0 +1,84 @@
+--- gentoolkit-dev-0.2.6.1/src/echangelog/echangelog	2006-06-08 12:12:34.000000000 +0200
++++ gentoolkit-dev-0.2.6.1/src/echangelog/echangelog	2006-06-08 12:23:21.000000000 +0200
+@@ -47,7 +47,12 @@
+ }
+ 
+ # Figure out what has changed around here
++if (-e "CVS/Entries") {
+ open C, 'cvs -fn up 2>&1 |' or die "Can't run cvs -fn up: $!\n";
++} elsif (-e ".svn/entries") {
++open C, 'svn st 2>&1 |' or die "Can't run svn st: $!\n";
++}
++
+ while (<C>) {
+     if (/^C (\S+)/) {
+         push @conflicts, $1; 
+@@ -56,7 +61,7 @@
+         push @unknown, $1;
+         $actions{$1} = '+';
+         next;
+-    } elsif (/^([ARM]) (\S+)/) {
++    } elsif (/^([ARM]) *(\S+)/) {
+         push @files, $2;
+         ($actions{$2} = $1) =~ tr/ARM/+-/d;
+     }
+@@ -84,7 +89,7 @@
+ # out above)
+ if (@unknown) {
+     print STDERR <<EOT;
+-Cvs reports the following unknown files.  Please use "cvs add" before
++Cvs reports the following unknown files.  Please use "cvs/svn add" before
+ running echangelog, or remove the files in question.
+ EOT
+     print STDERR map "? $_\n", @unknown;
+@@ -180,10 +185,15 @@
+ @ebuilds = grep /\.ebuild$/, @files;
+ @files = grep !/\.ebuild$/, @files;
+ if (@ebuilds) {
++    if (-e "CVS/Entries") {
+     open C, "cvs -f diff -U0 @ebuilds 2>&1 |" or die "Can't run cvs diff: $!\n";
++    } elsif (-e ".svn/entries") {
++    open C, 'svn --force diff @ebuilds 2>&1 |' or die "Can't run svn diff: $!\n";
++    }
++
+     $_ = <C>;
+     while (defined $_) {
+-        if (/^cvs diff: (([^\/]*?)\.ebuild) was removed/) { 
++        if (/^cvs\/svn diff: (([^\/]*?)\.ebuild) was removed/) { 
+             push @files, $1;
+         }
+         elsif (/^Index: (([^\/]*?)\.ebuild)\s*$/) { 
+@@ -207,11 +217,11 @@
+             # and we have the next line in $_ for processing
+             next;
+         }
+-        elsif (/^cvs.*?: (([^\/]*?)\.ebuild) is a new entry/) { 
++        elsif (/^cvs\/svn.*?: (([^\/]*?)\.ebuild) is a new entry/) { 
+             push @files, $1;
+             push @new_versions, $2;  # new ebuild, will create a new entry
+         }
+-        # other cvs output is ignored
++        # other cvs/svn output is ignored
+         $_ = <C>;
+     }
+ }
+@@ -230,7 +240,7 @@
+     print STDERR "**\n";
+     print STDERR "** NOTE: No non-trivial changed files found.  Normally echangelog\n";
+     print STDERR "** should be run after all affected files have been added and/or\n";
+-    print STDERR "** modified.  Did you forget to cvs add?\n";
++    print STDERR "** modified.  Did you forget to cvs/svn add?\n";
+     print STDERR "**\n";
+     @files = sort sortfunc @trivial;
+     @files = qw/ChangeLog/ unless @files;  # last resort to put something in the list
+@@ -362,7 +372,9 @@
+ # The text will be added just like with any other ChangeLog below.  
+ # Add the new ChangeLog to cvs before continuing.
+ if (open F, "CVS/Entries") {
+-    system("cvs -f add ChangeLog") unless (scalar grep /^\/ChangeLog\//, <F>);
++    system("cvs -f add ChangeLcg") unless (scalar grep /^\/ChangeLog\//, <F>);
++} elsif (open F, ".svn/entries") {
++    system("svn --force add ChangeLog") unless (scalar grep /^\/ChangeLog\//, <F>);
+ }
+ 
+ # vim:sw=4 ts=8 expandtab