qpkg fixage

5 files changed, 40 insertions, 52 deletions

diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog
index d42aee20759f..9e49bc8f54af 100644
--- a/app-admin/gentoolkit/ChangeLog
+++ b/app-admin/gentoolkit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.83 2003/06/08 13:18:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.84 2003/06/08 20:27:12 lostlogic Exp $
+
+*gentoolkit-0.1.26-r1 (08 Jun 2003)
+
+  08 Jun 2003; Brandon Low <lostlogic@gentoo.org> gentoolkit-0.1.26-r1.ebuild,
+  files/scripts/qpkg:
+  qpkg fixage from bug 15771
 
 *gentoolkit-0.1.26 (08 Jun 2003)
 
diff --git a/app-admin/gentoolkit/Manifest b/app-admin/gentoolkit/Manifest
index e0612cbe650c..5973f058de56 100644
--- a/app-admin/gentoolkit/Manifest
+++ b/app-admin/gentoolkit/Manifest
@@ -1,11 +1,11 @@
-MD5 f2ed5d5307db07a6e5c383a5f054e2df gentoolkit-0.1.26-r1.ebuild 2727
-MD5 82e75a2b9c96f8df7b0775bf54f91531 ChangeLog 18019
+MD5 a2dc53679fbdb0e86de39563296c8f6a gentoolkit-0.1.26-r1.ebuild 2732
+MD5 5f5b958ae48f660e09e2fd1091168b70 ChangeLog 18021
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.26-r1 0
 MD5 300f133ec5d3f34b92165edfd2d54538 files/euse/euse 33484
 MD5 8ac906ab7791d60344eb357af4002247 files/euse/README 4404
 MD5 4b37657e210479e18a3bb1620d65eb39 files/euse/euse.1 2719
 MD5 643c63442c088517b4648a3e865dfc55 files/euse/ChangeLog 112
-MD5 08ec60991a00ae64cb76eb24a691b8e5 files/scripts/qpkg 12606
+MD5 3c2714f087501f7c0ecddeb939443b78 files/scripts/qpkg 12634
 MD5 63305561ae679ea9ae5db64252c0b296 files/scripts/echangelog.pod 5055
 MD5 907aec00ccefd07a5801e35f135ed83f files/scripts/echangelog.1 9275
 MD5 8c3d26e8fab57634ef7d8231cde9945f files/scripts/etcat 33297
diff --git a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26 b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26
+++ b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r1
diff --git a/app-admin/gentoolkit/files/scripts/qpkg b/app-admin/gentoolkit/files/scripts/qpkg
index eeb5cc1f7580..644652546105 100644
--- a/app-admin/gentoolkit/files/scripts/qpkg
+++ b/app-admin/gentoolkit/files/scripts/qpkg
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # qpkg - query portage package system for various information
 #
@@ -6,9 +6,11 @@
 # This program is distributed under the terms of GPL version 2.
 #
 # Maintainer: Brandon Low <lostlogic@gentoo.org>
+# Additional code thanks to:
+#	      Josh Goebel <dreamer@firesedge.org>
 #
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.21 2003/06/08 13:18:48 mholzer Exp $
-ID='$Id: qpkg,v 1.21 2003/06/08 13:18:48 mholzer Exp $'
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.22 2003/06/08 20:27:12 lostlogic Exp $
+ID='$Id: qpkg,v 1.22 2003/06/08 20:27:12 lostlogic Exp $'
 VERSION=0.`echo ${ID} | cut -d\  -f3`
 
 PROG=`basename ${0}`
@@ -16,6 +18,7 @@ PROG=`basename ${0}`
 # Parse args
 verb=0
 group="*"
+params=${#}
 while [ ${#} -gt 0 ]
 do
 	a=${1}
@@ -59,14 +62,6 @@ do
 		inst=y
 		;;
 
-	-m|--masked)
-		grepmask="-L"
-		;;
-
-	-n|--non-masked)
-		grepmask="-l"
-		;;
-
 	-U|--uninstalled)
 		uninst=y
 		;;
@@ -121,8 +116,7 @@ do
 			usage=y
 			break
 		fi
-		# Kill a trailing slash
-		arg=${a%/}
+		arg=$a
 		;;
 		
 	esac
@@ -176,9 +170,7 @@ ${BR}Package Selection:
   ${BL}-fp, --find-pattern${NO}${T}finds to package that owns file matching *<pattern>*
   ${BL}-I,  --installed${NO}${T}Include${YL} only${NO} installed packages
   ${BL}-U,  --uninstalled${NO}${T}Include${YL} only${NO} uninstalled packages
-  ${BL}-m,  --masked${NO}${T}Include${YL} only${NO} masked packages
-  ${BL}-n,  --non-masked${NO}${T}Include${YL} only${NO} non-masked packages
-  ${BL}-g,  --group${NO}${T}${T}Find by group (can be combined with other searches)
+  ${BL}-g,  --group${NO}${T}${T}Find by goup (can be combined with other searches)
 
 ${BR}Information Selection:
   ${BL}-l,  --list${NO}${T}${T}List package content
@@ -193,7 +185,7 @@ ${T}${T}${T}depending on selected packages
 
 ${BR}Operation Modifiers:
   ${BL}-nc, --no-color${NO}${T}don't use colors
-  ${BL}-v,  --verbose${NO}${T}Be more verbose [ can be repeated twice ]
+  ${BL}-v,  --verbose${NO}${T}Be more verbose [ can be repeated twise ]
   ${BL}-vv${NO}${T}${T}${T}Same as ${BL}-v -v${NO}
 
 ${YL}Notes${NO}: 
@@ -205,16 +197,12 @@ ${YL}*${NO} The operation of some flags has been changed by the
 ${YL}*${NO} When using${BL} -f${NO} with ${BL}-l${NO} or ${BL}--check.. -v${NO} options, only
   matching files will be displayed, unless ${BL}-v${NO} is doubled, 
   (yet more verbose) or ${BL}-vv${NO} is used.
-${YL}*${NO} When using${BL} -q${NO}, it is important to note that the querying of deps is NOT
-  a complete check, because qpkg is not advanced enough (nor can it reasonably
-  made so) to check complete deps with versions.  Please use ${GR}depclean${NO} or
-  ${GR}emerge --dep-clean${NO} to more completely check the dependency sanity of your
-  system.
+
 
 ${YL}Examples${NO}:
   ${PROG} --dups		print duplicates oldest first
   ${PROG} --dups -v	.. with versions
-  ${PROG}			print list of all packages
+  ${PROG}			print list of installed packages
   ${PROG} porta -I		print versions of installed portage
   ${PROG} porta -i		.. + versions in portage tree + descriptions 
 			and homepages
@@ -225,13 +213,6 @@ ${YL}Examples${NO}:
 	exit
 fi
 
-if [ "${grepmask}" ]; then
-	mask=`python -c 'import portage; print portage.settings["ACCEPT_KEYWORDS"];' 2> /dev/null`
-	echo -e "Currently accepted keywords: ${BL}${mask}${NO}"
-	echo -e
-	mask=`echo ${mask} | perl -pe 's/\s+/|/'`
-fi
-
 #For the --dups switch only
 if [ "${dups}" ]; then
 	#First dig out the list of packages with duplicates
@@ -317,10 +298,9 @@ else
 		    ipak=`echo ${ipak}|sed -e "s: :\n:g"|grep ${group}`
 		fi
 		if [ ${arg} ]; then
-		    ipak=`echo ${ipak}|sed -e "s: :\n:g"|grep ${arg}`
-		fi
-		if [ -n "${mask}" ]; then
-		    ipak=`echo ${ipak}|xargs -r egrep ${grepmask} "^KEYWORDS=.*[[:space:]\"\'](${mask})[[:space:]\"\']"`
+			# avoid ${arg}="db" from pulling in every installed package
+			temp="/var/db/pkg/.*${arg}"	
+			ipak=`echo ${ipak}|sed -e "s: :\n:g"|grep ${temp}`
 		fi
 	fi
 	# not installed packages (yet:-)
@@ -332,9 +312,6 @@ else
 		if [ ${arg} ]; then
 		    upak=`echo ${upak}|sed -e "s: :\n:g"|grep ${arg}`
 		fi
-		if [ -n "${mask}" ]; then
-		    upak=`echo ${upak}|xargs -r egrep ${grepmask} "^KEYWORDS=.*[[:space:]\"\'](${mask})[[:space:]\"\']"`
-		fi
 	fi
 fi
 
@@ -345,10 +322,20 @@ 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}/${X}.ebuild:iii \1/\3:" \
-		-e "s:^/usr/portage/${X}/${X}/${X}\.ebuild:uuu \1/\3:"`
-	d=`dirname ${p}`
+	n=${p%.ebuild}
+	var_db_pkg="/var/db/pkg/"
+	n=${n/${var_db_pkg}/iii }
+	usr_portage="/usr/portage/"
+	n=${n/${usr_portage}/uuu }
+	n=${n/\/*\//\/}
+
+	d=${p%\/*.ebuild} # faster d=`dirname ${p}`
 	echo ${n}
+	
+	# if we have no passed parameters then 
+	# we can skip the extra conditional checks
+	[[ ${params} == 0 ]] && continue;
+	
 	if [ ${verb} -gt 1 ];then
 		echo "vvv    ${p}"
 	fi
@@ -358,11 +345,6 @@ for p in ${ipak} ${upak} -;do
 		desc=`grep DESCRIPTION ${p}| cut -d\" -f2`
 		echo -e "${T}${BL}${desc}${NO} [ ${YL}${home}${NO} ]"
 	fi
-
-	if [ "${mask}" ]; then
-		keywords=`grep KEYWORDS ${p}| cut -d\" -f2`
-		echo -e "${T}Keywords: ${BL}${keywords}${NO}"
-	fi
 	
 	if [ "${query}" ]; then
 		echo -e "${BL}DEPENDED ON BY:${NO}"
@@ -491,9 +473,9 @@ for p in ${ipak} ${upak} -;do
 	fi
 	
 done | (
-	if [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o "${mask}" -o ${verb} -gt 0 \) ]; then
+	if [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o ${verb} -gt 0 \) ]; then
 		sed -e "s:-r[0-9]\+$::" -e "s:-[0-9][^-]*$::"|sort -k2|uniq -1
-	elif [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o "${mask}" -o ${verb} -lt 2 \) ]; then
+	elif [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o ${verb} -lt 2 \) ]; then
 		sort -k2|uniq -1
 	else
 		cat
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.26.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.26-r1.ebuild
index d03b169d6bf2..9ce4178d27ba 100644
--- a/app-admin/gentoolkit/gentoolkit-0.1.26.ebuild
+++ b/app-admin/gentoolkit/gentoolkit-0.1.26-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.26.ebuild,v 1.1 2003/06/08 13:18:48 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/gentoolkit-0.1.26-r1.ebuild,v 1.1 2003/06/08 20:27:12 lostlogic Exp $
 
 DESCRIPTION="Collection of unofficial administration scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/"