etcat update

2 files changed, 30 insertions, 30 deletions

diff --git a/app-admin/gentoolkit/Manifest b/app-admin/gentoolkit/Manifest
index 1b107531ee16..3e9a1ca2aebb 100644
--- a/app-admin/gentoolkit/Manifest
+++ b/app-admin/gentoolkit/Manifest
@@ -1,32 +1,32 @@
-MD5 d20b3f221a8b6b4150738c7fac135f64 ChangeLog 16047
+MD5 1ef52d77e431ee3c9d2c8087e7f3cc89 gentoolkit-0.1.20.ebuild 2522
 MD5 813ce194de06a84659b74aaf3478094c gentoolkit-0.1.19-r4.ebuild 2456
+MD5 d20b3f221a8b6b4150738c7fac135f64 ChangeLog 16047
 MD5 55e349eab97b2eda131581480333d732 gentoolkit-0.1.19-r5.ebuild 2457
-MD5 1ef52d77e431ee3c9d2c8087e7f3cc89 gentoolkit-0.1.20.ebuild 2522
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.20 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.19-r4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.19-r5 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoolkit-0.1.20 0
-MD5 e038e2f6bb81dc1e939eda7322535015 files/gentool/ChangeLog 483
-MD5 4465ed729e3e37c812bed62d9aa940e1 files/gentool/gentool-author-coverage 351
-MD5 096c2fd773416b367779606e828f1069 files/gentool/gentool-bump-revision 1990
-MD5 50dccf92bb434c370a284d02ca63362b files/gentool/gentool-package-count 356
-MD5 8bd1ba99607f3b9c421aa0ba44e84fcc files/gentool/gentool-total-coverage 156
-MD5 e4a164d551dbf4f0fc809dec2a57e858 files/gentool/histogram.awk 308
-MD5 0385e6ea67705f527306506e71615cae files/portage-statistics/ChangeLog 375
-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 b14c642f0957806c0c0183b01f11f535 files/scripts/etcat 27397
-MD5 bbbb09c069b21bf1a373fd39139a5ed7 files/scripts/ChangeLog 1900
+MD5 c37f15d47fff40bdc38af94152263522 files/scripts/qpkg 12665
+MD5 1425d74a069e5cdd5fe2d99f12f2bf9c files/scripts/etcat 27417
 MD5 4b6bed0e41c186eda2d830d89a84b344 files/scripts/dep-clean 6956
-MD5 ae1ecff118b5583eac443b6afbccb0fd files/scripts/dep-clean.1 5645
-MD5 e2db91d0b6545c9a442ac0b61855e3bb files/scripts/echangelog 5775
-MD5 08871c6fedbd9385ef8a55e1f72f3a14 files/scripts/ekeyword 917
 MD5 1dc6c0bf013a3bca5e5b05257934acda files/scripts/etcat.1 2196
-MD5 8a01b5a884ddc44af62ddf32f44e4bde files/scripts/mkebuild 7806
 MD5 a7acade566ea2f6b9bb4e9e67871b49d files/scripts/pkg-clean 2861
 MD5 c60e5311fdbbfac79ea17c54dc8047b8 files/scripts/pkg-size 1224
-MD5 c37f15d47fff40bdc38af94152263522 files/scripts/qpkg 12665
 MD5 ac41939247058bc3d14dadeb9026e494 files/scripts/qpkg.1 3476
 MD5 347e69e1c9fba8b60fa631d92ea0a8f2 files/scripts/useflag 16164
 MD5 0a120feea2b79a3731c7912926421a27 files/scripts/useflag.1 5461
+MD5 8a01b5a884ddc44af62ddf32f44e4bde files/scripts/mkebuild 7806
+MD5 e2db91d0b6545c9a442ac0b61855e3bb files/scripts/echangelog 5775
+MD5 bbbb09c069b21bf1a373fd39139a5ed7 files/scripts/ChangeLog 1900
+MD5 ae1ecff118b5583eac443b6afbccb0fd files/scripts/dep-clean.1 5645
+MD5 08871c6fedbd9385ef8a55e1f72f3a14 files/scripts/ekeyword 917
+MD5 8bd1ba99607f3b9c421aa0ba44e84fcc files/portage-statistics/pst-total-coverage 156
+MD5 4465ed729e3e37c812bed62d9aa940e1 files/portage-statistics/pst-author-coverage 351
+MD5 0385e6ea67705f527306506e71615cae files/portage-statistics/ChangeLog 375
+MD5 e4a164d551dbf4f0fc809dec2a57e858 files/portage-statistics/histogram.awk 308
+MD5 50dccf92bb434c370a284d02ca63362b files/portage-statistics/pst-package-count 356
+MD5 50dccf92bb434c370a284d02ca63362b files/gentool/gentool-package-count 356
+MD5 4465ed729e3e37c812bed62d9aa940e1 files/gentool/gentool-author-coverage 351
+MD5 8bd1ba99607f3b9c421aa0ba44e84fcc files/gentool/gentool-total-coverage 156
+MD5 096c2fd773416b367779606e828f1069 files/gentool/gentool-bump-revision 1990
+MD5 e038e2f6bb81dc1e939eda7322535015 files/gentool/ChangeLog 483
+MD5 e4a164d551dbf4f0fc809dec2a57e858 files/gentool/histogram.awk 308
diff --git a/app-admin/gentoolkit/files/scripts/etcat b/app-admin/gentoolkit/files/scripts/etcat
index 711b56921243..10fd41909035 100644
--- a/app-admin/gentoolkit/files/scripts/etcat
+++ b/app-admin/gentoolkit/files/scripts/etcat
@@ -210,10 +210,8 @@ def pkgcmp(a,b):
 def search(search_key):
     
     matches = []    
-    cache = portage.db["/"]["vartree"]
     for package in portage.portdb.cp_all():
 	package_parts=package.split("/")
-	masked=0
 	if re.search(search_key.lower(), package_parts[1].lower()):
 	    matches.append(package)
     return matches
@@ -533,16 +531,16 @@ def uses(query):
     print "[             : (I) Col 2 - Installed With USE flags ]"
     
     for p in matches:
-	curver = portage.db["/"]["vartree"].dep_bestmatch(p)
-	
-	if curver:
+	curver = portage.db["/"]["porttree"].dbapi.match(p)
+	bestver = portage.best(curver)
+	if bestver:
 	    try:
-		iuse = portage.db["/"]["porttree"].dbapi.aux_get(curver,["IUSE"])
+		iuse = portage.db["/"]["porttree"].dbapi.aux_get(bestver,["IUSE"])
 	    except KeyError:
 		print "[ Error Occured. Ebuild not found for :", white(p), "]"
 		continue
 	else:
-	    print "[ No USE flags found for :", white(p), "]"
+	    print "[ * No USE flags found for :", white(p), "]"
 	    continue
 	
 	if iuse: usevar = iuse[0].split()
@@ -554,8 +552,10 @@ def uses(query):
 	if installed:
 	    try:
 		used = open(installed[-1] + "/USE").read().split()
-	    except:
+	    except IOError:
 		used = []
+	else:
+	    used = []
 
 	# store (inuse, inused, flag, desc)
 	output = []
@@ -579,7 +579,7 @@ def uses(query):
 	# pretty print
 	if output:
 	    print
-	    print white(" U I ") + "[ Found these USE variables in : " + white(p) + " ]"
+	    print white(" U I ") + "[ Found these USE variables in : " + white(bestver) + " ]"
 	    maxflag_len = 0
 	    for inuse, inused, u, desc in output:
 		if len(u) > maxflag_len: