[base-x] remove Canna

[base-x] add uim-gtk2 and uim-m17n
[gnome] add uim-gnome
[kde] add uim-qt

comps-f8.xml.in

@@ -349,7 +349,6 @@
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
-      <packagereq type="optional">Canna</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
@@ -366,6 +365,8 @@
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
+      <packagereq type="optional">uim-gtk2</packagereq>
+      <packagereq type="optional">uim-m17n</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
@@ -1035,6 +1036,7 @@
       <packagereq type="optional">trac-webadmin</packagereq>
       <packagereq type="optional">translate-toolkit</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
+      <packagereq type="optional">uim-gnome</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
@@ -2438,6 +2440,7 @@
       <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
+      <packagereq type="optional">uim-qt</packagereq>
     </packagelist>
   </group>
   <group>

comps-f9.xml.in

@@ -349,7 +349,6 @@
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
-      <packagereq type="optional">Canna</packagereq>
       <packagereq type="optional">dejavu-fonts</packagereq>
       <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
@@ -366,6 +365,8 @@
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
       <packagereq type="optional">switchdesk</packagereq>
+      <packagereq type="optional">uim-gtk2</packagereq>
+      <packagereq type="optional">uim-m17n</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
@@ -1035,6 +1036,7 @@
       <packagereq type="optional">trac-webadmin</packagereq>
       <packagereq type="optional">translate-toolkit</packagereq>
       <packagereq type="optional">ucblogo</packagereq>
+      <packagereq type="optional">uim-gnome</packagereq>
       <packagereq type="optional">utrac</packagereq>
       <packagereq type="optional">wxGlade</packagereq>
       <packagereq type="optional">xbsql</packagereq>
@@ -2438,6 +2440,7 @@
       <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
       <packagereq type="optional">speedcrunch</packagereq>
+      <packagereq type="optional">uim-qt</packagereq>
     </packagelist>
   </group>
   <group>