Index: genpkgindex
===================================================================
--- genpkgindex	(revision 343)
+++ genpkgindex	(working copy)
@@ -56,15 +56,46 @@
 for pkg in os.listdir('.'):
         if not os.path.basename(pkg).endswith("tbz2"):
                 continue
-        tbz2 = xpak.tbz2(pkg)
-        stuff = tbz2.getboth()
-        if not stuff:
-		print "Not a tbz2: "+str(pkg)
-                continue
-        cat = xpak.getitem(stuff, "CATEGORY")
-        if cat:
-                packages.append((cat, pkg, tbz2, stuff))
 
+	st = os.stat(pkg)
+
+	if not os.path.exists(portage.settings["PORTAGE_TMPDIR"]+"/portage/.xpak/"):
+		os.mkdir(portage.settings["PORTAGE_TMPDIR"]+"/portage/.xpak/")
+
+	fname = portage.settings["PORTAGE_TMPDIR"]+"/portage/.xpak/"+os.path.basename(pkg)[:-5]+".xpak"
+
+	if os.path.exists(fname):
+		if st.st_mtime != os.stat(fname).st_mtime:
+			#print "unlinking "+fname
+			os.unlink(fname)
+
+	if not os.path.exists(fname):
+
+	        tbz2 = xpak.tbz2(pkg)
+		xpdata = xpak.xpak_mem(tbz2.get_data())
+		fp = open(fname, "w")
+		fp.write(xpdata+xpak.encodeint(len(xpdata))+"STOP")
+		fp.close()
+
+		chksum = portage_checksum.perform_md5(pkg)
+		fp = open(fname[:-5]+".md5", "w")
+		fp.write(chksum)
+		fp.close()
+
+		os.utime(fname, (st.st_mtime, st.st_mtime))
+
+	else:
+		#print "loading cached: " + fname[:-5]
+		if os.path.exists(fname[:-5]+".md5"):
+			chksum = "".join(portage.grabfile(fname[:-5]+".md5"))
+		else:
+			chksum = portage_checksum.perform_md5(pkg)
+
+		tbz2 = xpak.tbz2(fname)
+		tbz2.scan()
+
+	packages.append((pkg, tbz2, chksum, st))
+
 packages.sort()
 
 timestamp=str(start).split(".")[0]
@@ -122,7 +153,14 @@
 					l.append("( %s )" % v.strip())
 	return ' '.join(l)
 
-for cat, pkg, tbz2, stuff in packages:
+for pkg, tbz2, chksum, st in packages:
+	stuff = tbz2.getboth()
+	if not stuff:
+		print "Not a tbz2: "+str(pkg)
+		continue
+
+	cat = xpak.getitem(stuff, "CATEGORY")
+
 	use = xpak.getitem(stuff, "USE")
 	if use is None:
 		use = ''
@@ -160,9 +198,8 @@
 		l.sort()
 		fp.write("USE: %s\n" % ' '.join(l))
 
-	st = os.stat(pkg)
 	fp.write("SIZE: "+ str(st[stat.ST_SIZE]) +"\n")
-	fp.write("MD5: "+portage_checksum.perform_md5(pkg)+"\n")
+	fp.write("MD5: "+chksum+"\n")
 	fp.write("\n")
 
 fp.write("\n")