diff -ru -x CVS gentoolkit/src/equery/equery gentoolkit.new/src/equery/equery
--- gentoolkit/src/equery/equery	2005-04-25 19:38:06.000000000 -0500
+++ gentoolkit.new/src/equery/equery	2005-04-27 22:00:55.000000000 -0500
@@ -1023,7 +1023,8 @@
 						depscache[catname] = [(pkg,x)]
 			print "done"
  
-		for pkg in packages:
+		for x in packages:
+			pkg = gentoolkit.Package(x)
 			try:
 				deps = pkg.get_runtime_deps()
 			except KeyError, e:
@@ -1209,7 +1210,8 @@
 		pfxmodes = [ "---", "I--", "-P-", "--O" ]
 		maskmodes = [ "  ", " ~", " -", "M ", "M~", "M-" ]
 
-		for pkg in matches:
+		for x in matches:
+			pkg = gentoolkit.Package(x)
 			if exclude(pkg):
 				continue
 
@@ -1343,7 +1345,8 @@
 		rx = re.compile(cat + "/" + name + "-" + ver + "(-" + rev + ")?")
 		pfxmodes = [ "---", "I--", "-P-", "--O" ]
 		maskmodes = [ "  ", " ~", " -", "M ", "M~", "M-" ]
-		for pkg in matches:
+		for x in matches:
+			pkg = gentoolkit.Package(x)
 			status = 0
 			if pkg.is_installed():
 				status = 1
diff -ru -x CVS gentoolkit/src/etcat/etcat gentoolkit.new/src/etcat/etcat
--- gentoolkit/src/etcat/etcat	2004-10-19 18:50:01.000000000 -0500
+++ gentoolkit.new/src/etcat/etcat	2005-04-27 23:33:19.000000000 -0500
@@ -257,7 +257,8 @@
 	
 	last_cp = ""
 
-	for pkg in matches:
+	for x in matches:
+		pkg = gentoolkit.Package(x)
 		new_cp = pkg.get_category()+"/"+pkg.get_name()
 		if last_cp != new_cp:
 			print green("*") + "  " + white(new_cp) + " :"
@@ -502,7 +503,8 @@
 
 	rx = re.compile(item)
 
-	for pkg in matches:
+	for x in matches:
+		pkg = gentoolkit.Package(x)
 		if pkg.get_contents():
 			for fn in pkg.get_contents().keys():
 				if rx.search(fn):
Only in gentoolkit.new/src/gentoolkit: glsa.py
diff -ru -x CVS gentoolkit/src/gentoolkit/helpers.py gentoolkit.new/src/gentoolkit/helpers.py
--- gentoolkit/src/gentoolkit/helpers.py	2005-04-25 19:38:06.000000000 -0500
+++ gentoolkit.new/src/gentoolkit/helpers.py	2005-04-27 23:43:19.000000000 -0500
@@ -92,21 +92,21 @@
 	return (resolved,unresolved)
 
 def find_all_installed_packages(prefilter=None):
-	"""Returns a list of all installed packages, after applying the prefilter
+	"""Returns a list of all installed package names, after applying the prefilter
 	function"""
 	t = vartree.dbapi.cpv_all()
 	if prefilter:
 		t = filter(prefilter,t)
-	return [Package(x) for x in t]
+	return t
 
 def find_all_uninstalled_packages(prefilter=None):
-	"""Returns a list of all uninstalled packages, after applying the prefilter
+	"""Returns a list of all uninstalled packages names, after applying the prefilter
 	function"""
 	alist = find_all_packages(prefilter)
-	return [x for x in alist if not x.is_installed()]
+	return [x for x in alist if not Package(x).is_installed()]
 
 def find_all_packages(prefilter=None):
-	"""Returns a list of all known packages, installed or not, after applying
+	"""Returns a list of all known package names installed or not, after applying
 	the prefilter function"""
 	t = portage.portdb.cp_all()
 	if prefilter:
@@ -114,7 +114,7 @@
 	t2 = []
 	for x in t:
 		t2 += portage.portdb.cp_list(x)
-	return [Package(x) for x in t2]
+	return t2
 
 def split_package_name(name):
 	"""Returns a list on the form [category, name, version, revision]. Revision will