Sort & cleanup.

comps-f14.xml.in

@@ -1514,7 +1514,7 @@
       <packagereq type="default">eclipse-texlipse</packagereq>
       <packagereq type="default">eclipse-veditor</packagereq>
       <packagereq type="default">electric</packagereq>
-      <packagereq type="default">electronics-menu</packagereq> 
+      <packagereq type="default">electronics-menu</packagereq>
       <packagereq type="default">emacs-dinotrace</packagereq>
       <packagereq type="default">emacs-gnuplot</packagereq>
       <packagereq type="default">emacs-irsim-mode</packagereq>
@@ -1553,7 +1553,7 @@
       <packagereq type="default">magic</packagereq>
       <packagereq type="default">magic-doc</packagereq>
       <packagereq type="default">mcu8051ide</packagereq>
-      <packagereq type="default">minicom</packagereq>	  
+      <packagereq type="default">minicom</packagereq>
       <packagereq type="default">nesc</packagereq>
       <packagereq type="default">netgen</packagereq>
       <packagereq type="default">ngspice</packagereq>
@@ -1598,7 +1598,7 @@
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
       <packagereq type="default">vrq</packagereq>
-	  <packagereq type="default">wb_builder</packagereq>
+      <packagereq type="default">wb_builder</packagereq>
       <packagereq type="default">xcircuit</packagereq>
       <packagereq type="default">xorg-x11-fonts-100dpi</packagereq>
       <packagereq type="default">xorg-x11-fonts-ISO8859-1-100dpi</packagereq>
@@ -1606,7 +1606,6 @@
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">freehdl</packagereq>
       <packagereq type="optional">kdesvn</packagereq>
-      <packagereq type="optional">minicom</packagereq>
       <packagereq type="optional">octave-forge</packagereq>
       <packagereq type="optional">rfdump</packagereq>
       <packagereq type="optional">simulavr</packagereq>
@@ -2929,7 +2928,6 @@
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">java-1.6.0-openjdk-plugin</packagereq>
       <packagereq type="default">nspluginwrapper</packagereq>
-      <packagereq type="optional">pino</packagereq>
       <packagereq type="default">transmission-gtk</packagereq>
       <packagereq type="optional">amsn</packagereq>
       <packagereq type="optional">arora</packagereq>
@@ -2991,6 +2989,7 @@
       <packagereq type="optional">pan</packagereq>
       <packagereq type="optional">pidgin</packagereq>
       <packagereq type="optional">pidgin-libnotify</packagereq>
+      <packagereq type="optional">pino</packagereq>
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
       <packagereq type="optional">psimedia</packagereq>
@@ -4510,6 +4509,34 @@
       <packagereq type="default">syncevolution-moblin</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>milkymist</id>
+    <_name>Milkymist</_name>
+    <_description>Toolchain for Milkymist hardware engineers.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">avr-binutils</packagereq>
+      <packagereq type="default">avr-gcc</packagereq>
+      <packagereq type="default">avr-gcc-c++</packagereq>
+      <packagereq type="default">avr-gdb</packagereq>
+      <packagereq type="default">avr-libc</packagereq>
+      <packagereq type="default">avr-libc-docs</packagereq>
+      <packagereq type="default">gplcver</packagereq>
+      <packagereq type="default">gtkwave</packagereq>
+      <packagereq type="default">iverilog</packagereq>
+      <packagereq type="default">lemon</packagereq>
+      <packagereq type="default">libftdi-devel</packagereq>
+      <packagereq type="default">llvm</packagereq>
+      <packagereq type="default">openocd</packagereq>
+      <packagereq type="default">qemu</packagereq>
+      <packagereq type="default">re2c</packagereq>
+      <packagereq type="default">srecord</packagereq>
+      <packagereq type="default">tftp</packagereq>
+      <packagereq type="default">tftp-server</packagereq>
+      <packagereq type="default">vim-common</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mingw32</id>
     <_name>MinGW cross-compiler</_name>
@@ -4555,34 +4582,6 @@
       <packagereq type="optional">mingw32-zlib</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>milkymist</id>
-    <_name>Milkymist</_name>
-    <_description>Toolchain for Milkymist hardware engineers.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-	  <packagereq type="default">avr-libc</packagereq>
-	  <packagereq type="default">avr-libc-docs</packagereq>
-	  <packagereq type="default">avr-binutils</packagereq>
-	  <packagereq type="default">avr-gcc</packagereq>
-	  <packagereq type="default">avr-gcc-c++</packagereq>
-	  <packagereq type="default">avr-gdb</packagereq>
-	  <packagereq type="default">gplcver</packagereq>
-	  <packagereq type="default">gtkwave</packagereq>
-      <packagereq type="default">iverilog</packagereq>
-	  <packagereq type="default">lemon</packagereq>
-	  <packagereq type="default">libftdi-devel</packagereq>
-	  <packagereq type="default">llvm</packagereq>
-      <packagereq type="default">openocd</packagereq>
-      <packagereq type="default">qemu</packagereq>
-      <packagereq type="default">re2c</packagereq>
-	  <packagereq type="default">srecord</packagereq>
-	  <packagereq type="default">tftp</packagereq>
-	  <packagereq type="default">tftp-server</packagereq>
-	  <packagereq type="default">vim-common</packagereq>
-    </packagelist>
-  </group>  
   <group>
     <id>mongolian-support</id>
     <_name>Mongolian Support</_name>

comps-f15.xml.in

@@ -2141,9 +2141,9 @@
       <packagereq type="optional">mgopen-cosmetica-fonts</packagereq>
       <packagereq type="optional">mgopen-modata-fonts</packagereq>
       <packagereq type="optional">mgopen-moderna-fonts</packagereq>
-      <packagereq type="optional">moyogo-molengo-fonts</packagereq>
       <packagereq type="optional">motoya-lcedar-fonts</packagereq>
       <packagereq type="optional">motoya-lmaru-fonts</packagereq>
+      <packagereq type="optional">moyogo-molengo-fonts</packagereq>
       <packagereq type="optional">mscore-fonts</packagereq>
       <packagereq type="optional">msimonson-anonymouspro-fonts</packagereq>
       <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
@@ -4605,6 +4605,34 @@
       <packagereq type="default">syncevolution-moblin</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>milkymist</id>
+    <_name>Milkymist</_name>
+    <_description>Toolchain for Milkymist hardware engineers.</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">avr-binutils</packagereq>
+      <packagereq type="default">avr-gcc</packagereq>
+      <packagereq type="default">avr-gcc-c++</packagereq>
+      <packagereq type="default">avr-gdb</packagereq>
+      <packagereq type="default">avr-libc</packagereq>
+      <packagereq type="default">avr-libc-docs</packagereq>
+      <packagereq type="default">gplcver</packagereq>
+      <packagereq type="default">gtkwave</packagereq>
+      <packagereq type="default">iverilog</packagereq>
+      <packagereq type="default">lemon</packagereq>
+      <packagereq type="default">libftdi-devel</packagereq>
+      <packagereq type="default">llvm</packagereq>
+      <packagereq type="default">openocd</packagereq>
+      <packagereq type="default">qemu</packagereq>
+      <packagereq type="default">re2c</packagereq>
+      <packagereq type="default">srecord</packagereq>
+      <packagereq type="default">tftp</packagereq>
+      <packagereq type="default">tftp-server</packagereq>
+      <packagereq type="default">vim-common</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>mingw32</id>
     <_name>MinGW cross-compiler</_name>
@@ -4650,34 +4678,6 @@
       <packagereq type="optional">mingw32-zlib</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>milkymist</id>
-    <_name>Milkymist</_name>
-    <_description>Toolchain for Milkymist hardware engineers.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-	  <packagereq type="default">avr-libc</packagereq>
-	  <packagereq type="default">avr-libc-docs</packagereq>
-	  <packagereq type="default">avr-binutils</packagereq>
-	  <packagereq type="default">avr-gcc</packagereq>
-	  <packagereq type="default">avr-gcc-c++</packagereq>
-	  <packagereq type="default">avr-gdb</packagereq>
-	  <packagereq type="default">gplcver</packagereq>
-	  <packagereq type="default">gtkwave</packagereq>
-      <packagereq type="default">iverilog</packagereq>
-	  <packagereq type="default">lemon</packagereq>
-	  <packagereq type="default">libftdi-devel</packagereq>
-	  <packagereq type="default">llvm</packagereq>
-      <packagereq type="default">openocd</packagereq>
-      <packagereq type="default">qemu</packagereq>
-      <packagereq type="default">re2c</packagereq>
-	  <packagereq type="default">srecord</packagereq>
-	  <packagereq type="default">tftp</packagereq>
-	  <packagereq type="default">tftp-server</packagereq>
-	  <packagereq type="default">vim-common</packagereq>
-    </packagelist>
-  </group>  
   <group>
     <id>mongolian-support</id>
     <_name>Mongolian Support</_name>