version 0.1.18: add ekeyword and echangelog

6 files changed, 167 insertions, 3 deletions

diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog
index 27e31725d42e..422078776a46 100644
--- a/app-admin/gentoolkit/ChangeLog
+++ b/app-admin/gentoolkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gentoolkit
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.54 2003/02/10 16:20:38 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.55 2003/02/10 19:42:03 agriffis Exp $
+
+  10 Feb 2003; Aron Griffis <agriffis@gentoo.org> gentoolkit-0.1.18.ebuild files/scripts/echangelog files/scripts/ekeyword files/digest-gentoolkit-0.1.18 :
+  Add echangelog and ekeyword.  Bump version to 0.1.18.
 
   10 Feb 2003; Guy Martin <gmsoft@gentoo.org> gentoolkit-0.1.17-r11.ebuild :
   Added hppa to keywords.
diff --git a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.18 b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.18
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.18
diff --git a/app-admin/gentoolkit/files/scripts/ChangeLog b/app-admin/gentoolkit/files/scripts/ChangeLog
index 62a9c9b65d7b..d0b7d9ac5c8b 100644
--- a/app-admin/gentoolkit/files/scripts/ChangeLog
+++ b/app-admin/gentoolkit/files/scripts/ChangeLog
@@ -1,3 +1,5 @@
-2002-11-11 Martin Holzer <mholzer@gentoo.org>
-	* fix emerge-webrsync 0 byte bug  
+10 Feb 2003 Aron Griffis <agriffis@gentoo.org>
+	* add echangelog and ekeyword
 
+11 Nov 2002 Martin Holzer <mholzer@gentoo.org>
+	* fix emerge-webrsync 0 byte bug  
diff --git a/app-admin/gentoolkit/files/scripts/echangelog b/app-admin/gentoolkit/files/scripts/echangelog
new file mode 100644
index 000000000000..93119b3d12b6
--- /dev/null
+++ b/app-admin/gentoolkit/files/scripts/echangelog
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+#
+# echangelog: Update the ChangeLog for an ebuild.  For example:
+#
+#   $ echangelog 'Add ~alpha to KEYWORDS'
+#   4a5,7
+#   >   10 Feb 2003; Aron Griffis <agriffis@gentoo.org> oaf-0.6.8-r1.ebuild :
+#   >   Add ~alpha to KEYWORDS
+#   >
+
+
+use POSIX qw(strftime);
+
+my @files = ();
+my ($entry, $user, $date, $text);
+
+die "No ChangeLog in this directory\n" unless -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+)/) {
+        push @files, $1;
+    }
+}
+close C;
+
+die "No changed files found\n" unless @files;
+
+if ($ARGV[0]) {
+    $entry = $ARGV[0];
+} else {
+    local $/ = undef;
+    print "Please type the log entry, finish with ctrl-d\n";
+    $entry = <>;
+}
+
+die "Empty entry; aborting\n" unless $entry =~ /\S/;
+$entry =~ s/^\s*(.*?)\s*$/$1/;  # trim whitespace
+$entry =~ s/^/  /gm;            # add indentation
+
+$user = $ENV{'ECHANGELOG_USER'} ||
+        sprintf("%s <%s\@gentoo.org>", (getpwuid($<))[6,0]);
+
+$date = strftime("%d %b %Y", localtime);
+
+open I, '<ChangeLog' or die "Can't open ChangeLog for input: $!\n";
+{ local $/ = undef; $text = <I>; }
+close I;
+
+open O, '>ChangeLog.new' or die "Can't open ChangeLog.new for output: $!\n";
+$text =~ s/^.*?\n(?=\s)/$&\n  $date; $user @files :\n$entry\n/s;
+print O $text;
+close O;
+
+system 'diff ChangeLog ChangeLog.new';
+rename 'ChangeLog.new', 'ChangeLog' or die "Can't rename: $!\n";
diff --git a/app-admin/gentoolkit/files/scripts/ekeyword b/app-admin/gentoolkit/files/scripts/ekeyword
new file mode 100644
index 000000000000..aa09c96561ea
--- /dev/null
+++ b/app-admin/gentoolkit/files/scripts/ekeyword
@@ -0,0 +1,33 @@
+#!/usr/bin/perl -w
+#
+# ekeyword: Update the KEYWORDS in an ebuild.  For example:
+#
+#   $ ekeyword ~alpha oaf-0.6.8-r1.ebuild
+#   12c12
+#   < KEYWORDS="x86 ppc sparc"
+#   ---
+#   > KEYWORDS="x86 ppc sparc ~alpha"
+
+
+die "syntax: ekeyword { arch | ~arch } ebuild...\n" unless @ARGV > 1;
+
+my $kw = shift @ARGV;
+(my $arch = $kw) =~ s|~||;
+
+for my $f (@ARGV) {
+    open I, "<$f"       or die "Can't read $f: $!\n";
+    open O, ">$f.new"   or die "Can't write $f.new: $!\n";
+    select O;
+
+    while (<I>) {
+        /^KEYWORDS/ or print, next;
+        s/~?$arch/$kw/ || s/.*?['"].*?(?=['"])/$& $kw/;
+        print $_, <I>;
+    }
+
+    close I;
+    close O;
+
+    system "diff $f $f.new"     or die "Can't run diff: $!\n";
+    rename "$f.new", "$f"       or die "Can't rename: $!\n";
+}
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.18.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.18.ebuild
new file mode 100644
index 000000000000..fa48b1c707d5
--- /dev/null
+++ b/app-admin/gentoolkit/gentoolkit-0.1.18.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2002 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.18.ebuild,v 1.1 2003/02/10 19:42:03 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"
+
+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/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/emerge-webrsync
+#	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."
+	ewarn "The 'etc-update' utility has been moved to portage."
+	einfo ""
+	einfo "emerge-webrsync -v displays the wget status"
+	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 is no more supported and has been removed"
+
+}