minor echangelog fixes

4 files changed, 118 insertions, 11 deletions

diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog
index 4384470e8815..b392dc7d0909 100644
--- a/app-admin/gentoolkit/ChangeLog
+++ b/app-admin/gentoolkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gentoolkit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.65 2003/03/02 23:16:33 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.66 2003/03/08 04:43:48 agriffis Exp $
+
+*gentoolkit-0.1.19-r2 (07 Mar 2003)
+
+  07 Mar 2003; Aron Griffis <agriffis@gentoo.org> gentoolkit-0.1.19-r2.ebuild:
+  Bump revision to pick up minor echangelog fixes
 
 *gentoolkit-0.1.19-r1 (02 Mar 2003)
 
diff --git a/app-admin/gentoolkit/files/scripts/ChangeLog b/app-admin/gentoolkit/files/scripts/ChangeLog
index 413a93ed285f..a49f9ef79617 100644
--- a/app-admin/gentoolkit/files/scripts/ChangeLog
+++ b/app-admin/gentoolkit/files/scripts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gentoolkit/lintool/scripts
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/ChangeLog,v 1.8 2003/02/25 14:37:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/ChangeLog,v 1.9 2003/03/08 04:42:29 agriffis Exp $
+
+07 Mar 2003 Aron Griffis <agriffis@gentoo.org>
+	* fix more echangelog things
+		- Try to better determine when to add a new entry
+		- Catch cvs removes
 
 25 Feb 2003 Aron Griffis <agriffis@gentoo.org>
 	* fix more echangelog buglets, reported by Hannes and Weeve
diff --git a/app-admin/gentoolkit/files/scripts/echangelog b/app-admin/gentoolkit/files/scripts/echangelog
index 030fe89812d4..575c7d762f82 100644
--- a/app-admin/gentoolkit/files/scripts/echangelog
+++ b/app-admin/gentoolkit/files/scripts/echangelog
@@ -49,12 +49,31 @@ if (-f 'ChangeLog') {
 open C, 'cvs diff --brief 2>&1 |' or die "Can't run cvs diff: $!\n";
 while (<C>) {
     /ChangeLog/ and next;
-    if (/^cvs server: (\S+) .*new entry/ || /^Index: (\S+)/) {
+	if (/^cvs server: (([^\/]*?)\.ebuild) was removed/) { 
+		push @files, $1;
+		$versions{$2} = 0;	# existing ebuild that was removed
+	}
+    if (/^cvs server: (\S+) was removed/) {
+		push @files, $1;
+		# existing file that has been removed
+	}
+	elsif (/^Index: (([^\/]*?)\.ebuild)\s*$/) { 
+		push @files, $1;
+		$versions{$2} = 0;	# existing ebuild that has changed
+	}
+	elsif (/^Index: (\S+)/) {
+		push @files, $1;
+		# existing file, but not an ebuild, so no %version entry
+	}
+	elsif (/^cvs server: (([^\/]*?)\.ebuild) is a new entry/) { 
+		push @files, $1;
+		$versions{$2} = -1;	# new ebuild, will create a new entry
+	}
+	elsif (/^cvs server: (\S+) is a new entry/) {
         push @files, $1;
-        if ($1 =~ /^([^\/]*?)\.ebuild$/) {
-            $versions{$1} = -1;
-        }
-    }
+		# new file, but not an ebuild, so no %version entry
+	}
+	# other cvs output is ignored
 }
 close C;
 die "No changed files found (did you forget to cvs add?)\n" unless @files;
@@ -86,10 +105,12 @@ $entry = Text::Wrap::fill('  ', '  ', $entry);  # does not append a \n
 $entry .= "\n$input";                           # append user input
 
 # Find the version that's highest in the file (or determine if we're
-# adding a new version).
+# adding a new version).  Note that existing ebuilds have version=0,
+# new ebuilds have version=-1 to make them automatically rise to the
+# top.
 if (%versions) {
     for (keys %versions) {
-        $versions{$_} = index $text, $_;
+        $versions{$_} = index $text, $_ unless $versions{$_};
     }
     $version = (sort { $versions{$a} <=> $versions{$b} } keys %versions)[0];
 }
@@ -118,8 +139,9 @@ if (!defined $version) {
     #$text =~ s/^\*\Q$version\E\.?(?:ebuild)?\s.*\n/$&\n$entry\n/m 
 } else {
     # Insert at the top with a new version marker
-    # XXX Fix to use a regex similar to above
-    $text =~ s/^(.*?)\n(?=\s)/$&\n*$version ($date)\n\n$entry\n/s
+	$text =~ s/^( .*? )				  # grab header
+	            \s*\n(?=\ \ \d|\*|\z) # suck up trailing whitespace
+			  /$1\n\n*$version ($date)\n\n$entry\n\n/sx
         or die "Failed to insert new entry (3)\n";
 }
 
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.19-r2.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.19-r2.ebuild
new file mode 100644
index 000000000000..86506cb6d7b6
--- /dev/null
+++ b/app-admin/gentoolkit/gentoolkit-0.1.19-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/gentoolkit-0.1.19-r2.ebuild,v 1.1 2003/03/08 04:43:48 agriffis Exp $
+
+DESCRIPTION="Collection of unofficial administration scripts for Gentoo"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/~karltk/projects/gentoolkit/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+
+DEPEND=">=dev-lang/python-2.0
+	>=dev-util/dialog-0.7
+	>=sys-devel/perl-5.6
+	>=sys-apps/grep-2.5-r1"
+
+src_install() {
+	dodir /usr/share/gentoolkit
+
+	insinto /usr/share/gentoolkit
+	doins ${FILESDIR}/portage-statistics/histogram.awk
+
+	dobin ${FILESDIR}/gentool/gentool-bump-revision
+	dobin ${FILESDIR}/gentool/gentool-total-coverage
+	dobin ${FILESDIR}/gentool/gentool-author-coverage
+	dobin ${FILESDIR}/gentool/gentool-package-count
+	docinto gentool
+	dodoc ${FILESDIR}/gentool/ChangeLog
+
+	dobin ${FILESDIR}/scripts/qpkg
+	doman ${FILESDIR}/scripts/qpkg.1
+	fowners root:wheel /usr/bin/qpkg
+	fperms 0750 /usr/bin/qpkg
+
+	dobin ${FILESDIR}/scripts/dep-clean
+	doman ${FILESDIR}/scripts/dep-clean.1
+	fowners root:wheel /usr/bin/dep-clean
+	fperms 0750 /usr/bin/dep-clean
+
+	dobin ${FILESDIR}/scripts/pkg-size
+# 2002-08-06: karltk
+# This utility currently does more harm than good. I'm not including it
+# until it has been fixed properly. See #5777 in particular.
+#	dobin ${FILESDIR}/scripts/useflag
+#	doman ${FILESDIR}/scripts/useflag.1
+
+	dosbin ${FILESDIR}/scripts/pkg-clean
+	dosbin ${FILESDIR}/scripts/mkebuild
+#	dosbin ${FILESDIR}/scripts/epm
+
+#	dobin ${FILESDIR}/lintool/lintool
+#	doman ${FILESDIR}/lintool/lintool.1
+#	docinto lintool
+#	dodoc ${FILESDIR}/lintool/{checklist-for-ebuilds,ChangeLog}
+
+	dobin ${FILESDIR}/scripts/echangelog
+	dobin ${FILESDIR}/scripts/ekeyword
+}
+
+pkg_postinst() {
+	ewarn "The 'useflag' utility has been removed, pending an overhaul. It has proven to be too brittle to be used safely."
+	einfo ""
+	einfo "since epm is now it's own package please emerge it yourself sys-apps/epm" 
+	einfo ""
+	einfo "if you are upgrading from gentoolkit-0.1.17-r7 or earlier and"
+	einfo "you're using mkebuild, please remove ~/.mkebuild to update your settings"
+	einfo ""
+	einfo "dep-clean has been re-incarnated at the request of dragon.  The new version"
+	einfo "is much faster and better than the old one, and is included herein"
+	einfo ""
+	einfo "emerge-webrsync is now in sys-apps/portage (2.0.47+) included"
+	einfo ""
+
+}