fix bug in etcat

5 files changed, 93 insertions, 7 deletions

diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog
index 86977cd9dcfd..abc00f9498d0 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.76 2003/04/29 00:03:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.77 2003/04/30 09:22:03 liquidx Exp $
+
+*gentoolkit-0.1.21-r1 (30 Apr 2003)
+
+  30 Apr 2003; Alastair Tse <liquidx@gentoo.org> files/scripts/etcat:
+  Major functional bugfix for etcat (#20174).
 
 *gentoolkit-0.1.21-r1 (29 Apr 2003)
 
diff --git a/app-admin/gentoolkit/Manifest b/app-admin/gentoolkit/Manifest
index c2f335a98154..cf462a13c727 100644
--- a/app-admin/gentoolkit/Manifest
+++ b/app-admin/gentoolkit/Manifest
@@ -1,5 +1,7 @@
-MD5 4bff1a01f14df4c11d09019b83109853 ChangeLog 16468
+MD5 b61d9eb6533c0e092aa021771ddf438f ChangeLog 16622
+MD5 cab7fc05fab906f337e786581b6d68b1 gentoolkit-0.1.21-r2.ebuild 2532
 MD5 0eadd8ce39bdb60022146d2c46704d61 gentoolkit-0.1.21-r1.ebuild 2532
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.21-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.21-r1 0
 MD5 e038e2f6bb81dc1e939eda7322535015 files/gentool/ChangeLog 483
 MD5 4465ed729e3e37c812bed62d9aa940e1 files/gentool/gentool-author-coverage 351
@@ -12,11 +14,13 @@ MD5 e4a164d551dbf4f0fc809dec2a57e858 files/portage-statistics/histogram.awk 308
 MD5 4465ed729e3e37c812bed62d9aa940e1 files/portage-statistics/pst-author-coverage 351
 MD5 50dccf92bb434c370a284d02ca63362b files/portage-statistics/pst-package-count 356
 MD5 8bd1ba99607f3b9c421aa0ba44e84fcc files/portage-statistics/pst-total-coverage 156
+MD5 4634f6762f1c8f934d69230a4c6277a1 files/scripts/etcat 30411
 MD5 d1bfc9edcec6b7eb9fafaea2a8bbe360 files/scripts/ChangeLog 2009
 MD5 4b6bed0e41c186eda2d830d89a84b344 files/scripts/dep-clean 6956
 MD5 ae1ecff118b5583eac443b6afbccb0fd files/scripts/dep-clean.1 5645
 MD5 172d4230ad584060150c2595a3bad142 files/scripts/echangelog 6017
 MD5 08871c6fedbd9385ef8a55e1f72f3a14 files/scripts/ekeyword 917
+MD5 413345a5a3407a323f486bb7ba828d12 files/scripts/etcat.1 2511
 MD5 8a01b5a884ddc44af62ddf32f44e4bde files/scripts/mkebuild 7806
 MD5 a7acade566ea2f6b9bb4e9e67871b49d files/scripts/pkg-clean 2861
 MD5 c60e5311fdbbfac79ea17c54dc8047b8 files/scripts/pkg-size 1224
@@ -25,6 +29,4 @@ MD5 ac41939247058bc3d14dadeb9026e494 files/scripts/qpkg.1 3476
 MD5 347e69e1c9fba8b60fa631d92ea0a8f2 files/scripts/useflag 16164
 MD5 0a120feea2b79a3731c7912926421a27 files/scripts/useflag.1 5461
 MD5 907aec00ccefd07a5801e35f135ed83f files/scripts/echangelog.1 9275
-MD5 f92b06cf1e507fb6df5ca0eda037a5d4 files/scripts/etcat 30331
-MD5 413345a5a3407a323f486bb7ba828d12 files/scripts/etcat.1 2511
 MD5 63305561ae679ea9ae5db64252c0b296 files/scripts/echangelog.pod 5055
diff --git a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.21-r2 b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.21-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.21-r2
diff --git a/app-admin/gentoolkit/files/scripts/etcat b/app-admin/gentoolkit/files/scripts/etcat
index ed7db58050b0..25373c40ec59 100644
--- a/app-admin/gentoolkit/files/scripts/etcat
+++ b/app-admin/gentoolkit/files/scripts/etcat
@@ -6,7 +6,7 @@
 # 
 #  etcat v0.1.4 (27 Apr 2003)
 #
-#  $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/etcat,v 1.4 2003/04/29 00:03:31 liquidx Exp $
+#  $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/etcat,v 1.5 2003/04/30 09:22:03 liquidx Exp $
 #
 # --| About |--------------------------------------------------------
 #
@@ -41,6 +41,8 @@
 # 
 # --| Changes |------------------------------------------------------
 #
+#  * etcat-0.1.5 (30 Apr 2003)
+#    - Fixed disappearing short opts. Oops.
 #  * etcat-0.1.4 (27 Apr 2003)
 #    - Cleaned up command execution code to provide a single place
 #      to specify functions
@@ -941,12 +943,11 @@ def main():
     # delegates the commandline stuff to functions
     pointer = 2
     # short/long opts mapping
-    shortopts = map(lambda x: x[0], options.values())
+    shortopts = map(lambda x: "-" + x[0], options.values())
     short2long = {}
     for k,v in options.items():
 	short2long[v[0]] = k
     longopts = options.keys()
-
     # loop thru arguments
     for arg in sys.argv[1:]:
 	if arg[0] == "-" and len(arg) == 2 and arg in shortopts:
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.21-r2.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.21-r2.ebuild
new file mode 100644
index 000000000000..1654dc886181
--- /dev/null
+++ b/app-admin/gentoolkit/gentoolkit-0.1.21-r2.ebuild
@@ -0,0 +1,78 @@
+# 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.21-r2.ebuild,v 1.1 2003/04/30 09:22:03 liquidx Exp $
+
+DESCRIPTION="Collection of unofficial administration scripts for Gentoo"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc alpha mips hppa arm"
+
+DEPEND=">=dev-lang/python-2.0
+	>=dev-util/dialog-0.7
+	>=dev-lang/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/etcat
+	doman ${FILESDIR}/scripts/etcat.1
+
+	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
+
+#	dobin ${FILESDIR}/lintool/lintool
+#	doman ${FILESDIR}/lintool/lintool.1
+#	docinto lintool
+#	dodoc ${FILESDIR}/lintool/{checklist-for-ebuilds,ChangeLog}
+
+	dobin ${FILESDIR}/scripts/echangelog
+	doman ${FILESDIR}/scripts/echangelog.1
+	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 ""
+
+}