Simplify code for derived Package attributes. (trunk r10266)

svn path=/main/branches/2.1.2/; revision=10267

diff --git a/bin/emerge b/bin/emerge
index fc6a687a99f80ec683f0917b39e2cf13371cbc9b..1cf8dd84e018e11cfdb521c9b19df58871218582 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1427,10 +1427,8 @@ class Package(Task):
                self.cp = portage.cpv_getkey(self.cpv)
                self.slot_atom = "%s:%s" % (self.cp, self.metadata["SLOT"])
                self.cpv_slot = "%s:%s" % (self.cpv, self.metadata["SLOT"])
-               cpv_parts = portage.catpkgsplit(self.cpv)
-               self.category = cpv_parts[0]
-               self.pv_split = cpv_parts[1:]
-               self.pf = self.cpv.replace(self.category + "/", "", 1)
+               self.category, self.pf = portage.catsplit(self.cpv)
+               self.pv_split = portage.catpkgsplit(self.cpv)[1:]
 
        def _get_hash_key(self):
                hash_key = getattr(self, "_hash_key", None)