few qpkg fixes:

  '-f' mode now works for directories
  properly handle and parse installed ebuild path for latest portage quirks

3 files changed, 67 insertions, 5 deletions

diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog
index 0ceb62e7d4ba..6ab8e58ffe0a 100644
--- a/app-admin/gentoolkit/ChangeLog
+++ b/app-admin/gentoolkit/ChangeLog
@@ -1,7 +1,16 @@
 # 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.3 2002/02/03 11:40:24 vitaly Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.4 2002/02/11 15:28:47 vitaly Exp $
 
+
+*gentoolkit-0.1.2 (11 Feb 2002)
+
+  11 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org> files/scripts/qpkg:
+
+  Bugfixes in qpkg:
+    Fixed "-f" mode for directories.
+    Fixed package name parsing to comply with the latest portage SLOT changes
+  
 *gentoolkit-0.1.1 (3 Feb 2002)
 
   3 Feb 2002; Vitaly Kushneriuk <vitaly@gentoo.org>:
diff --git a/app-admin/gentoolkit/files/scripts/qpkg b/app-admin/gentoolkit/files/scripts/qpkg
index 73f10e4e9752..9e2add498c2d 100644
--- a/app-admin/gentoolkit/files/scripts/qpkg
+++ b/app-admin/gentoolkit/files/scripts/qpkg
@@ -5,7 +5,7 @@
 # Copiright (c) Vitaly Kushneriuk <vitaly_kushneriuk@yahoo.com>
 # This program is distributed under the terms of GPL version 2.
 #
-ID='$Id: qpkg,v 1.2 2002/02/03 11:32:39 vitaly Exp $'
+ID='$Id: qpkg,v 1.3 2002/02/11 15:28:47 vitaly Exp $'
 VERSION=0.`echo $ID | cut -d\  -f3`
 
 PROG=`basename $0`
@@ -202,7 +202,7 @@ if [ "$ffind" ]; then
 		| xargs --no-run-if-empty -n 1 dirname`
 	else
 		dirs=`ls /var/db/pkg/$group/*/CONTENTS \
-		| xargs grep -l " $arg " \
+		| xargs grep -l " $arg\( .*\)*$" \
 		| xargs --no-run-if-empty -n 1 dirname`
 	fi
 	ipak=`(
@@ -228,7 +228,7 @@ for p in $ipak $upak -;do
 
 	# cut common prefix from ebuild name and mark installed/uninstalled packages
 	# Note: iii/uuu will be replaced by the pipe at the end
-	n=`echo $p | sed -e "s:^/var/db/pkg/$X/$X.*:iii \1/\2:" \
+	n=`echo $p | sed -e "s:^/var/db/pkg/$X/$X/$X.ebuild:iii \1/\3:" \
 		-e "s:^/usr/portage/$X/$X/$X\.ebuild:uuu \1/\3:"`
 	d=`dirname $p`
 	echo $n
@@ -254,7 +254,7 @@ for p in $ipak $upak -;do
 				if [ "$fpat" ]; then
 					grep "$arg" $d/CONTENTS
 				else
-					grep " $arg " $d/CONTENTS
+					grep " $arg\( .*\)*$" $d/CONTENTS
 				fi
 			else
 				cat $d/CONTENTS
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.3.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.3.ebuild
new file mode 100644
index 000000000000..edeb7b19417b
--- /dev/null
+++ b/app-admin/gentoolkit/gentoolkit-0.1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/gentoolkit-0.1.3.ebuild,v 1.1 2002/02/11 15:28:47 vitaly Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Collection of unofficial administration scripts for Gentoo"
+SRC_URI=""
+HOMEPAGE="http://"
+
+DEPEND=""
+RDEPEND=">=dev-lang/python-2.0
+	>=sys-devel/perl-5.6"
+
+src_install () {
+	dodir /usr/share/gentoolkit
+
+	insinto /usr/share/gentoolkit
+	doins ${FILESDIR}/coverage/histogram.awk
+
+	dosbin ${FILESDIR}/coverage/total-coverage
+	dosbin ${FILESDIR}/coverage/author-coverage
+
+	dosbin ${FILESDIR}/lintool/lintool
+	
+	dosbin ${FILESDIR}/scripts/etc-update
+	dosbin ${FILESDIR}/scripts/pkg-clean
+	dosbin ${FILESDIR}/scripts/qpkg
+	dosbin ${FILESDIR}/scripts/mkebuild
+	dosbin ${FILESDIR}/scripts/emerge-webrsync
+	dosbin ${FILESDIR}/scripts/epm
+
+	dodoc ${FILESDIR}/lintool/checklist-for-ebuilds
+	
+}
+
+
+pkg_postinst() {
+    #notify user about new diff/sdiff mode for etc-update being the default
+    if [ -f /usr/sbin/etc-update ]
+    then
+        echo
+        echo "!! Warning: etc-update no longer defaults to using"
+        echo "!!          vim diff mode!"
+        echo "!!"
+        echo "!!          Vim diff mode is still available with a quick"
+        echo "!!          configuration change.  If you want to use vim"
+        echo "!!          diff, just edit the top of the script as"
+        echo "!!          appropriate."
+        echo
+    fi
+}
+