--- bin/emerge.org	2004-01-12 13:09:59.000000000 +0100
+++ bin/emerge	2004-01-12 13:09:25.000000000 +0100
@@ -505,7 +505,9 @@
 					print "emerge: search: aux_get() failed, skipping"
 					continue
 				if self.searchre.search(full_desc):
-					self.matches["desc"].append([full_package,masked])
+					mycpv = portage.catpkgsplit(full_package)
+					mypkg = mycpv[0]+"/"+mycpv[1]
+					self.matches["desc"].append([mypkg,masked])
 		self.mlen=0
 		for mtype in self.matches.keys():
 			self.matches[mtype].sort()
@@ -518,16 +520,13 @@
 		print " "
 		for mtype in self.matches.keys():	
 			for match,masked in self.matches[mtype]:
-				if mtype=="pkg":
-					catpack=match
-					full_package = portage.portdb.xmatch("bestmatch-visible",match)
-					if not full_package:
-						#no match found; we don't want to query description
-						masked=1
-						full_package=portage.best(portage.portdb.xmatch("match-all",match))
-				else:
-					full_package=match
-					catpack=portage.pkgsplit(match)[0]
+				print match, portage.pkgsplit(match)
+				catpack=match
+				full_package = portage.portdb.xmatch("bestmatch-visible",match)
+				if not full_package:
+					#no match found; we don't want to query description
+					masked=1
+					full_package=portage.best(portage.portdb.xmatch("match-all",match))
 				if full_package:
 					try:
 						desc, homepage, license = portage.portdb.aux_get(full_package,["DESCRIPTION","HOMEPAGE","LICENSE"])