readded back patch from #22432.

4 files changed, 37 insertions, 9 deletions

diff --git a/app-admin/gentoolkit/Manifest b/app-admin/gentoolkit/Manifest
index ce776326b270..94720b8bae2b 100644
--- a/app-admin/gentoolkit/Manifest
+++ b/app-admin/gentoolkit/Manifest
@@ -1,5 +1,5 @@
-MD5 5f5b958ae48f660e09e2fd1091168b70 ChangeLog 18021
-MD5 a2dc53679fbdb0e86de39563296c8f6a gentoolkit-0.1.26-r2.ebuild 2732
+MD5 5fe7d9a56af739b612113bb27c1f8af9 ChangeLog 18221
+MD5 cce4d607630095c033a11959cc4dabb8 gentoolkit-0.1.26-r2.ebuild 2730
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.26-r2 0
 MD5 643c63442c088517b4648a3e865dfc55 files/euse/ChangeLog 112
 MD5 8ac906ab7791d60344eb357af4002247 files/euse/README 4404
@@ -28,7 +28,7 @@ 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
-MD5 b4fc691381b1460e4a59037f4e50a1ae files/scripts/qpkg 13518
+MD5 d9f082837fdc7001ad2584a00d8a0573 files/scripts/qpkg 13514
 MD5 ac41939247058bc3d14dadeb9026e494 files/scripts/qpkg.1 3476
 MD5 7e7e5784aa3677b050d6d6c76cb29e61 files/scripts/revdep-rebuild 7986
 MD5 347e69e1c9fba8b60fa631d92ea0a8f2 files/scripts/useflag 16164
diff --git a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r1 b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r1
+++ b/app-admin/gentoolkit/files/digest-gentoolkit-0.1.26-r2
diff --git a/app-admin/gentoolkit/files/scripts/qpkg b/app-admin/gentoolkit/files/scripts/qpkg
index 644652546105..f4b48a453d4f 100644
--- a/app-admin/gentoolkit/files/scripts/qpkg
+++ b/app-admin/gentoolkit/files/scripts/qpkg
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # qpkg - query portage package system for various information
 #
@@ -9,8 +9,8 @@
 # Additional code thanks to:
 #	      Josh Goebel <dreamer@firesedge.org>
 #
-# $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 $'
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.23 2003/06/12 19:47:14 mholzer Exp $
+ID='$Id: qpkg,v 1.23 2003/06/12 19:47:14 mholzer Exp $'
 VERSION=0.`echo ${ID} | cut -d\  -f3`
 
 PROG=`basename ${0}`
@@ -59,6 +59,14 @@ do
 		;;
 
 	-I|--installed)
+	-m|--masked)
+		grepmask="-L"
+		;;
+
+	-n|--non-masked)
+		grepmask="-l"
+		;;
+
 		inst=y
 		;;
 
@@ -168,6 +176,8 @@ ${BR}Duplicate Locating:
 ${BR}Package Selection:
   ${BL}-f,  --find-file${NO}${T}finds package that owns file <file>
   ${BL}-fp, --find-pattern${NO}${T}finds to package that owns file matching *<pattern>*
+  ${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}-I,  --installed${NO}${T}Include${YL} only${NO} installed packages
   ${BL}-U,  --uninstalled${NO}${T}Include${YL} only${NO} uninstalled packages
   ${BL}-g,  --group${NO}${T}${T}Find by goup (can be combined with other searches)
@@ -215,6 +225,13 @@ fi
 
 #For the --dups switch only
 if [ "${dups}" ]; then
+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
+
 	#First dig out the list of packages with duplicates
 	find /var/db/pkg -iname "*${arg}*.ebuild" 2> /dev/null > /tmp/qpkg.lst
 	dups=`cat /tmp/qpkg.lst | cut -f7 -d/ |
@@ -302,6 +319,9 @@ else
 			temp="/var/db/pkg/.*${arg}"	
 			ipak=`echo ${ipak}|sed -e "s: :\n:g"|grep ${temp}`
 		fi
+		if [ -n "${mask}" ]; then
+		    ipak=`echo ${ipak}|xargs -r egrep ${grepmask} "^KEYWORDS=.*[[:space:]\"\'](${mask})[[:space:]\"\']"`
+		fi
 	fi
 	# not installed packages (yet:-)
 	if [ ! "${inst}" ]; then
@@ -312,6 +332,9 @@ 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
 
@@ -335,6 +358,11 @@ for p in ${ipak} ${upak} -;do
 	# if we have no passed parameters then 
 	# we can skip the extra conditional checks
 	[[ ${params} == 0 ]] && continue;
+
+	if [ "${mask}" ]; then
+		keywords=`grep KEYWORDS ${p}| cut -d\" -f2`
+		echo -e "${T}Keywords: ${BL}${keywords}${NO}"
+	fi
 	
 	if [ ${verb} -gt 1 ];then
 		echo "vvv    ${p}"
@@ -473,9 +501,9 @@ for p in ${ipak} ${upak} -;do
 	fi
 	
 done | (
-	if [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o ${verb} -gt 0 \) ]; then
+	if [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o "${mask}" -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 ${verb} -lt 2 \) ]; then
+	elif [ ! \( "${tcheck}" -o "${mcheck}" -o "${info}" -o "${list}" -o "${query}" -o "${mask}" -o ${verb} -lt 2 \) ]; then
 		sort -k2|uniq -1
 	else
 		cat
diff --git a/app-admin/gentoolkit/gentoolkit-0.1.26-r1.ebuild b/app-admin/gentoolkit/gentoolkit-0.1.26-r2.ebuild
index 9ce4178d27ba..0d6c68b49e99 100644
--- a/app-admin/gentoolkit/gentoolkit-0.1.26-r1.ebuild
+++ b/app-admin/gentoolkit/gentoolkit-0.1.26-r2.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-r1.ebuild,v 1.1 2003/06/08 20:27:12 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/gentoolkit-0.1.26-r2.ebuild,v 1.1 2003/06/12 19:47:14 mholzer Exp $
 
 DESCRIPTION="Collection of unofficial administration scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/"