--- mash-0.1.18/mash/multilib.py	2007-06-21 12:29:30.000000000 -0400
+++ mash/mash/multilib.py	2007-09-06 10:23:04.000000000 -0400
@@ -5,7 +5,7 @@ class MultilibMethod:
     def __init__(self):
         self.name = 'base'
     def select(self, po):
-        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace', 'valgrind']
+        prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace' ]
         if po.arch.find('64') != -1:
             if po.name in prefer_64:
                 return True
@@ -54,7 +54,7 @@ class RuntimeMultilibMethod(MultilibMeth
     
     def select(self, po):
         libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
-        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts' ]
+        whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts', 'valgrind' ]
         if po.name in whitelist:
             return True
         if MultilibMethod.select(self,po):
@@ -87,18 +109,18 @@
         self.name = 'devel'
     
     def select(self, po):
-        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
+        blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
         whitelist = ['perl']
         if po.name in blacklist:
             return False
-        if po.name.startswith('kernel'):
-            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
-                if p_name == 'kernel-devel':
-                    return False
         if po.name in whitelist:
             return True
         if RuntimeMultilibMethod.select(self,po):
             return True
+        if po.name.startswith('kernel'):
+            for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
+                if p_name == 'kernel-devel':
+                    return False
         if po.name.endswith('-devel'):
             return True
         return False