Add echangelog svn changes to the sunrise overlay, bug 136048

svn path=/; revision=7

7 files changed, 298 insertions, 0 deletions

diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog
new file mode 100644
index 000000000..d2fec65b0
--- /dev/null
+++ b/app-portage/gentoolkit-dev/ChangeLog
@@ -0,0 +1,151 @@
+# ChangeLog for app-portage/gentoolkit-dev
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.33 2006/03/25 05:38:41 agriffis Exp $
+
+  08 Jun 2006; Stefan Schweizer <genstef@gentoo.org> +., +files,
+  +files/echangelog-svn.diff, +metadata.xml:
+  Add echangelog svn changes to the sunrise overlay, bug 136048
+
+*gentoolkit-dev-0.2.6.1 (25 Mar 2006)
+
+  25 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+  -gentoolkit-dev-0.2.6.ebuild, +gentoolkit-dev-0.2.6.1.ebuild:
+  Re-release because the previous release wasn't up to date
+
+*gentoolkit-dev-0.2.6 (25 Mar 2006)
+
+  25 Mar 2006; Aron Griffis <agriffis@gentoo.org>
+  +gentoolkit-dev-0.2.6.ebuild:
+  Update eviewcvs for sources.gentoo.org; make it work with subversion too
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  -gentoolkit-dev-0.2.3.ebuild, -gentoolkit-dev-0.2.4.ebuild,
+  gentoolkit-dev-0.2.5.ebuild:
+  stable everywhere
+
+*gentoolkit-dev-0.2.5 (12 Jul 2005)
+
+  12 Jul 2005; Aron Griffis <agriffis@gentoo.org>
+  +gentoolkit-dev-0.2.5.ebuild:
+  Fix echangelog to work correctly with gtk+ #92966
+
+  27 May 2005; Aron Griffis <agriffis@gentoo.org>
+  gentoolkit-dev-0.2.4.ebuild:
+  stable everywhere
+
+  27 May 2005; Aron Griffis <agriffis@gentoo.org>
+  gentoolkit-dev-0.2.4.ebuild:
+  fix SRC_URI to point to mirrors instead of ~karltk #92356
+
+*gentoolkit-dev-0.2.4 (12 May 2005)
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org>
+  -gentoolkit-dev-0.2.0_pre1.ebuild, -gentoolkit-dev-0.2.0_pre2.ebuild,
+  -gentoolkit-dev-0.2.0_pre3.ebuild, -gentoolkit-dev-0.2.0_pre4.ebuild,
+  -gentoolkit-dev-0.2.1.ebuild, -gentoolkit-dev-0.2.2.ebuild,
+  gentoolkit-dev-0.2.3.ebuild, +gentoolkit-dev-0.2.4.ebuild:
+  Bump to 0.2.4. Mark 0.2.3 stable on arm and s390. Trim a bazillion old
+  versions.
+
+  05 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gentoolkit-dev-0.2.3.ebuild:
+  Stable on hppa.
+
+  01 May 2005; Joshua Kinard <kumba@gentoo.org> gentoolkit-dev-0.2.3.ebuild:
+  Marked stable on mips.
+
+  16 Apr 2005; <gongloo@gentoo.org> gentoolkit-dev-0.2.3.ebuild:
+  Stable on ppc-macos.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  gentoolkit-dev-0.2.3.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gentoolkit-dev-0.2.2.ebuild:
+  Marked stable on x86.
+
+  03 Apr 2005; Joseph Jezak <josejx@gentoo.org> gentoolkit-dev-0.2.3.ebuild:
+  Marked ppc stable.
+
+  01 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gentoolkit-dev-0.2.3.ebuild:
+  Stable on sparc
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org> gentoolkit-dev-0.2.3.ebuild:
+  stable on alpha amd64 ia64 x86
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org>
+  gentoolkit-dev-0.2.0_pre4.ebuild:
+  stable on ia64
+
+*gentoolkit-dev-0.2.3 (12 Mar 2005)
+
+  12 Mar 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +gentoolkit-dev-0.2.3.ebuild:
+  New upstream release.
+
+*gentoolkit-dev-0.2.2 (01 Mar 2005)
+
+  01 Mar 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +gentoolkit-dev-0.2.1.ebuild, +gentoolkit-dev-0.2.2.ebuild:
+  New upstream release.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 Dec 2004; Mamoru KOMACHI <usata@gentoo.org>
+  gentoolkit-dev-0.2.0_pre4.ebuild:
+  Stable on ppc-macos; _pre4 is the only one capable of handling ppc-macos
+  keyword correctly (ekeyword).
+
+*gentoolkit-dev-0.2.1 (10 Nov 2004)
+
+  10 Nov 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +gentoolkit-dev-0.2.1.ebuild:
+  New upstream release.
+
+*gentoolkit-dev-0.2.0_pre4 (27 Sep 2004)
+
+  27 Sep 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gentoolkit-dev-0.2.0_pre4.ebuild: New upstream version.
+
+  21 Jun 2004; <agriffis@gentoo.org> gentoolkit-dev-0.2.0_pre3.ebuild:
+  Stable everywhere
+
+  11 Jun 2004; Lars Weiler <pylon@gentoo.org>
+  gentoolkit-dev-0.2.0_pre3.ebuild:
+  Stable on ppc.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gentoolkit-dev-0.2.0_pre3.ebuild:
+  Stable on alpha.
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> gentoolkit-dev-0.2.0_pre3.ebuild:
+  marking stable on amd64
+
+*gentoolkit-dev-0.2.0_pre3 (14 Apr 2004)
+
+  14 Apr 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gentoolkit-dev-0.2.0_pre3.ebuild: New upstream version.
+  
+  04 Mar 2004; Brian Jackson <iggy@gentoo.org>
+  gentoolkit-dev-0.2.0_pre2.ebuild:
+  added s390 keywords
+
+*gentoolkit-dev-0.2.0_pre2 (08 Feb 2004)
+
+  08 Feb 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gentoolkit-dev-0.2.0_pre2.ebuild: New upstream version, adds ebump,
+  epkgmove and gensync.
+  
+
+  07 Feb 2004; Marius Mauch <genone@gentoo.org>
+  gentoolkit-dev-0.2.0_pre1.ebuild:
+  marking stable for portage-2.0.50
+
+*gentoolkit-dev-0.2.0_pre1 (15 Jan 2004)
+
+  15 Jan 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  gentoolkit-dev-0.2.0_pre1.ebuild: Initial import.  Ebuild submitted by
+  myself.
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
new file mode 100644
index 000000000..958af6a48
--- /dev/null
+++ b/app-portage/gentoolkit-dev/Manifest
@@ -0,0 +1,20 @@
+AUX echangelog-svn.diff 3143 RMD160 e5ece5447cdcfc50bcfb34d88e95537d4ca3c5b8 SHA1 929b8506750ca7410a9012a6be54ed328cc08b27 SHA256 771d98daea9b9df8169255426b0623fbfe312b82850543e69abdc22ad5e5c8ab
+MD5 4b87bfd4a771045a9d83a8d3f27e2a1a files/echangelog-svn.diff 3143
+RMD160 e5ece5447cdcfc50bcfb34d88e95537d4ca3c5b8 files/echangelog-svn.diff 3143
+SHA256 771d98daea9b9df8169255426b0623fbfe312b82850543e69abdc22ad5e5c8ab files/echangelog-svn.diff 3143
+DIST gentoolkit-dev-0.2.6.1.tar.gz 47324 RMD160 a65b7ce89977406c707796ea686b4caca4392799 SHA1 7de2ffbe24ff2cb398a33097e61284d16995c158 SHA256 469df57c1457eaa8b79d4d31f2aec05bfa1ad93407e0000d606f671010e6d544
+EBUILD gentoolkit-dev-0.2.6.1.ebuild 828 RMD160 ba4aa5075120f4cfd79622117a9310759f670ae3 SHA1 b9c0050314444fe7e739956cbc5a6571dd83e181 SHA256 a0ca897f7449cf1f84f8059b60db34551ea2c85610d0921e8490c1ad6019b55c
+MD5 2d87fe0bd0faedaec85ed6e8bbf80286 gentoolkit-dev-0.2.6.1.ebuild 828
+RMD160 ba4aa5075120f4cfd79622117a9310759f670ae3 gentoolkit-dev-0.2.6.1.ebuild 828
+SHA256 a0ca897f7449cf1f84f8059b60db34551ea2c85610d0921e8490c1ad6019b55c gentoolkit-dev-0.2.6.1.ebuild 828
+MISC ChangeLog 4872 RMD160 525c7d0acf467af228e097f16ba7a04b6b4026a9 SHA1 de1a0d3538b307b0c93479e57805e9841b2a8d2b SHA256 5b33229e765fa10fbc5402e7f172a1fc5f7b36b58a8d91b8aa96e3f4902898cc
+MD5 e0a8c14a2cb92ff7c88b6c87ed42f7d5 ChangeLog 4872
+RMD160 525c7d0acf467af228e097f16ba7a04b6b4026a9 ChangeLog 4872
+SHA256 5b33229e765fa10fbc5402e7f172a1fc5f7b36b58a8d91b8aa96e3f4902898cc ChangeLog 4872
+MISC metadata.xml 282 RMD160 0eb345cd4d45d200be98d46ef58d9c7d984d0fea SHA1 e884a6236439bc56617e7fe1c48fc10a356e01a3 SHA256 bbc59170a0b8682ed3a03f67bafc63610875532ab87b33a3ad2695482624f5a8
+MD5 5f551d730b5b9029b8ca6caa63bcea04 metadata.xml 282
+RMD160 0eb345cd4d45d200be98d46ef58d9c7d984d0fea metadata.xml 282
+SHA256 bbc59170a0b8682ed3a03f67bafc63610875532ab87b33a3ad2695482624f5a8 metadata.xml 282
+MD5 b3bf849db0cacae8176f64e712482aeb files/digest-gentoolkit-dev-0.2.6.1 265
+RMD160 989559694c01dfc89bf95f126ae43f7b2b09b143 files/digest-gentoolkit-dev-0.2.6.1 265
+SHA256 65336cce806fbf98fe00acbaf398fa88a4059143c175f3410755e14511e7fd2f files/digest-gentoolkit-dev-0.2.6.1 265
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
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.1.ebuild
new file mode 100644
index 000000000..696566194
--- /dev/null
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.1.ebuild,v 1.1 2006/03/25 05:37:26 agriffis Exp $
+
+inherit eutils
+
+DESCRIPTION="Collection of developer scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/~karltk/projects/gentoolkit/"
+SRC_URI="http://dev.gentoo.org/~agriffis/dist//${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/portage-2.0.50
+	>=dev-lang/python-2.0
+	>=dev-util/dialog-0.7
+	>=dev-lang/perl-5.6
+	>=sys-apps/grep-2.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/echangelog-svn.diff
+}
+
+src_install() {
+	make DESTDIR=${D} install-gentoolkit-dev
+}
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
new file mode 100644
index 000000000..8ab1d6793
--- /dev/null
+++ b/app-portage/gentoolkit-dev/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tools-portage</herd>
+<longdescription>
+Gentoolkit-dev is a collection of developer tools for the Gentoo
+distribution.
+</longdescription>
+</pkgmetadata>