diff --git a/comps-cleanup.xsl b/comps-cleanup.xsl
index 51111edd..fe525226 100644
--- a/comps-cleanup.xsl
+++ b/comps-cleanup.xsl
@@ -12,7 +12,7 @@
      Fedora not installing the comps DTD anywhere xsltproc can find it.
      However without DTD there is no way to check the files completely.
 
-     © Nicolas Mailhot <nim at fedoraproject dot org> 2006 -->
+     © Nicolas Mailhot <nim at fedoraproject dot org> 2006-2008 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" extension-element-prefixes="exsl">
   <xsl:strip-space elements="*"/>
   <xsl:output method="xml" indent="yes" encoding="UTF-8" doctype-system="comps.dtd" doctype-public="-//Red Hat, Inc.//DTD Comps info//EN"/>
@@ -34,16 +34,19 @@
   </xsl:variable>
   <xsl:variable name="attribute-sort-order">
     <unknown/>
+    <arch/>
+    <name/>
+    <package/>
     <type/>
     <requires/>
     <basearch/>
   </xsl:variable>
-<!-- Preserve most nodes -->
+  <!-- Preserve most nodes -->
   <xsl:template match="*" priority="0">
     <xsl:apply-templates select="." mode="normalize"/>
   </xsl:template>
   <xsl:template match="*" mode="normalize">
-<!-- Group comments with the logically-following element -->
+    <!-- Group comments with the logically-following element -->
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
       <xsl:apply-templates select="@*">
@@ -52,16 +55,16 @@
       <xsl:apply-templates select="*|text()"/>
     </xsl:copy>
   </xsl:template>
-<!-- Preserve attributes and text nodes -->
+  <!-- Preserve attributes and text nodes -->
   <xsl:template match="comment()|text()">
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy/>
   </xsl:template>
-<!-- Preserve attributes -->
+  <!-- Preserve attributes -->
   <xsl:template match="@*">
     <xsl:copy/>
   </xsl:template>
-<!-- Sort groups by id, and categories by display order -->
+  <!-- Sort groups by id, and categories by display order -->
   <xsl:template match="comps" priority="1">
     <xsl:apply-templates select="preceding-sibling::node()[normalize-space()][1][self::comment()] "/>
     <xsl:copy>
@@ -72,27 +75,45 @@
         <xsl:sort select="display_order/text()"/>
         <xsl:sort select="translate(id/text(),$lcletters,$ucletters)"/>
       </xsl:apply-templates>
+      <xsl:apply-templates select="blacklist"/>
+      <xsl:apply-templates select="whiteout"/>
     </xsl:copy>
   </xsl:template>
-<!-- Warn about empty groups -->
+  <xsl:template match="blacklist" priority="1">
+    <xsl:copy>
+      <xsl:apply-templates select="package">
+        <xsl:sort select="@arch"/>
+        <xsl:sort select="@name"/>
+      </xsl:apply-templates>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="whiteout" priority="1">
+    <xsl:copy>
+      <xsl:apply-templates select="ignoredep">
+        <xsl:sort select="@package"/>
+        <xsl:sort select="@requires"/>
+      </xsl:apply-templates>
+    </xsl:copy>
+  </xsl:template>
+  <!-- Warn about empty groups -->
   <xsl:template match="group[count(key('packages-by-group',id/text()))=0]" priority="2">
     <xsl:message>☹☹☹ Empty group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
     <xsl:apply-templates select="." mode="normalize"/>
   </xsl:template>
-<!-- Warn about duplicate groups being merged -->
+  <!-- Warn about duplicate groups being merged -->
   <xsl:template match="group[generate-id(.) != generate-id(key('unique-groups',id/text())[1])]" priority="3">
     <xsl:message> ☹☹ Duplicate group <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
-<!-- Warn about empty categories -->
+  <!-- Warn about empty categories -->
   <xsl:template match="category[count(key('groups-by-category',id/text()))=0]" priority="2">
     <xsl:message>☹☹☹ Empty category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/>!</xsl:message>
     <xsl:apply-templates select="." mode="normalize"/>
   </xsl:template>
-<!-- Warn about duplicate categories being merged -->
+  <!-- Warn about duplicate categories being merged -->
   <xsl:template match="category[generate-id(.) != generate-id(key('unique-categories',id/text())[1])]" priority="3">
     <xsl:message> ☹☹ Duplicate category <xsl:value-of select="concat(_name/text(),' (',id/text(),')')"/> will be merged.</xsl:message>
   </xsl:template>
-<!-- Sort packages within a group by class then name -->
+  <!-- Sort packages within a group by class then name -->
   <xsl:template match="packagelist" priority="1">
     <xsl:copy>
       <xsl:apply-templates select="key('packages-by-group',../id/text())">
@@ -101,7 +122,7 @@
       </xsl:apply-templates>
     </xsl:copy>
   </xsl:template>
-<!-- Sort groups within a category by name -->
+  <!-- Sort groups within a category by name -->
   <xsl:template match="category/grouplist" priority="1">
     <xsl:copy>
       <xsl:apply-templates select="key('groups-by-category',../id/text())">
@@ -109,16 +130,16 @@
       </xsl:apply-templates>
     </xsl:copy>
   </xsl:template>
-<!-- Kill duplicate package entries -->
+  <!-- Kill duplicate package entries -->
   <xsl:template match="packagereq[generate-id(.) != generate-id(key('unique-package-entries',concat(../../id/text(),'/',text()))[1])]" priority="2">
     <xsl:message>☹☹☹ Ignoring duplicate reference to <xsl:value-of select="concat(@type,' package ',text())"/> in group <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
     <xsl:message>     ⇒ Only its first reference (<xsl:value-of select="key('unique-package-entries',concat(../../id/text(),'/',text()))[1]/@type"/> package) will be kept.</xsl:message>
   </xsl:template>
-<!-- Kill duplicate group entries -->
+  <!-- Kill duplicate group entries -->
   <xsl:template match="category/grouplist/groupid[generate-id(.) != generate-id(key('unique-group-entries',concat(../../id/text(),'/',text()))[1])]" priority="1">
     <xsl:message>  ☹ Ignoring duplicate reference to group <xsl:value-of select="text()"/> in category <xsl:value-of select="concat(../../_name/text(),' (',../../id/text(),')')"/>.</xsl:message>
   </xsl:template>
-<!-- Warn about packages referenced several times 
+  <!-- Warn about packages referenced several times
   <xsl:template match="packagereq[generate-id(.) = generate-id(key('unique-packages',text())[2])]" priority="1">
     <xsl:variable name="dupes" select="key('unique-packages',text())"/>
     <xsl:message>  ☹ Package <xsl:value-of select="text()"/> is referenced in <xsl:value-of select="count($dupes)"/> groups:</xsl:message>
diff --git a/comps-f10.xml.in b/comps-f10.xml.in
index 5507440f..c12163e0 100644
--- a/comps-f10.xml.in
+++ b/comps-f10.xml.in
@@ -355,11 +355,11 @@
       <packagereq type="optional">xorg-x11-xfs</packagereq>
       <packagereq type="optional">xorg-x11-xfs-utils</packagereq>
       <packagereq type="optional">xorg-x11-xsm</packagereq>
-      <packagereq type="optional">xterm</packagereq>
       <packagereq type="optional">xscreensaver</packagereq>
       <packagereq type="optional">xscreensaver-base</packagereq>
       <packagereq type="optional">xscreensaver-extras</packagereq>
       <packagereq type="optional">xscreensaver-gl-extras</packagereq>
+      <packagereq type="optional">xterm</packagereq>
     </packagelist>
   </group>
   <group>
@@ -538,6 +538,7 @@
     <langonly>my</langonly>
     <packagelist>
       <packagereq type="default">padauk-fonts</packagereq>
+      <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -856,9 +857,9 @@
       <packagereq type="optional">cogito</packagereq>
       <packagereq type="optional">colordiff</packagereq>
       <packagereq type="optional">coredumper</packagereq>
+      <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cpan2rpm</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
-      <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cppunit</packagereq>
       <packagereq type="optional">cproto</packagereq>
       <packagereq type="optional">crossvc</packagereq>
@@ -1112,8 +1113,8 @@
       <packagereq type="optional">gperiodic</packagereq>
       <packagereq type="optional">gtypist</packagereq>
       <packagereq type="optional">kdeedu</packagereq>
-      <packagereq type="optional">kdeedu-math</packagereq>
       <packagereq type="optional">kdeedu-kstars</packagereq>
+      <packagereq type="optional">kdeedu-math</packagereq>
       <packagereq type="optional">moodle</packagereq>
       <packagereq type="optional">stellarium</packagereq>
       <packagereq type="optional">tuxtype2</packagereq>
@@ -1370,8 +1371,8 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-fi_FI</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-voikko</packagereq>
       <packagereq type="default">enchant-voikko</packagereq>
-      <packagereq type="optional">tmispell-voikko</packagereq>
       <packagereq type="optional">mozvoikko</packagereq>
+      <packagereq type="optional">tmispell-voikko</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1454,7 +1455,6 @@
       <packagereq type="optional">linux-libertine-fonts</packagereq>
       <packagereq type="optional">lohit-fonts-kashmiri</packagereq>
       <packagereq type="optional">lohit-fonts-konkani</packagereq>
-      <packagereq type="optional">lohit-fonts-maithili</packagereq>
       <packagereq type="optional">lohit-fonts-malayalam</packagereq>
       <packagereq type="optional">lohit-fonts-marathi</packagereq>
       <packagereq type="optional">lohit-fonts-nepali</packagereq>
@@ -1464,6 +1464,7 @@
       <packagereq type="optional">mgopen-fonts</packagereq>
       <packagereq type="optional">mona-fonts-sazanami</packagereq>
       <packagereq type="optional">mona-fonts-VLGothic</packagereq>
+      <packagereq type="optional">myanmar3-unicode-fonts</packagereq>
       <packagereq type="optional">nafees-web-naskh-fonts</packagereq>
       <packagereq type="optional">roadstencil-fonts</packagereq>
       <packagereq type="optional">samyak-fonts-devanagari</packagereq>
@@ -1923,6 +1924,7 @@
       <packagereq type="default">gvfs-archive</packagereq>
       <packagereq type="default">gvfs-gphoto2</packagereq>
       <packagereq type="default">gvfs-smb</packagereq>
+      <packagereq type="default">libcanberra-gtk2</packagereq>
       <packagereq type="default">mousetweaks</packagereq>
       <packagereq type="default">nautilus-cd-burner</packagereq>
       <packagereq type="default">nautilus-sendto</packagereq>
@@ -1932,7 +1934,6 @@
       <packagereq type="default">pulseaudio-esound-compat</packagereq>
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
-      <packagereq type="default">libcanberra-gtk2</packagereq>
       <packagereq type="default">tomboy</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
@@ -1968,8 +1969,8 @@
       <packagereq type="optional">gnome-phone-manager</packagereq>
       <packagereq type="optional">gnome-pilot-conduits</packagereq>
       <packagereq type="optional">gnome-schedule</packagereq>
-      <packagereq type="optional">gnomesword</packagereq>
       <packagereq type="optional">gnome-theme-curvylooks</packagereq>
+      <packagereq type="optional">gnomesword</packagereq>
       <packagereq type="optional">gnotime</packagereq>
       <packagereq type="optional">gonvert</packagereq>
       <packagereq type="optional">grsync</packagereq>
@@ -2428,8 +2429,8 @@
     <uservisible>false</uservisible>
     <langonly>hu</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-hu</packagereq>
+      <packagereq type="conditional" requires="gcompris">gcompris-sound-hu</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-hu</packagereq>
       <packagereq type="conditional" requires="kdelibs3">kde-i18n-Hungarian</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Hungarian</packagereq>
@@ -2867,10 +2868,10 @@
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-kashmiri</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3040,10 +3041,10 @@
     <langonly>kok</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-fonts-konkani</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
       <packagereq type="default">iok</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3323,11 +3324,11 @@
     <uservisible>false</uservisible>
     <langonly>mai</langonly>
     <packagelist>
-      <packagereq type="default">lohit-fonts-maithili</packagereq>
+      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
       <packagereq type="default">iok</packagereq>
+      <packagereq type="default">lohit-fonts-maithili</packagereq>
       <packagereq type="default">m17n-contrib-hindi</packagereq>
       <packagereq type="default">m17n-db-hindi</packagereq>
-      <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-hindi</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3626,8 +3627,8 @@
       <packagereq type="optional">qcad</packagereq>
       <packagereq type="optional">referencer</packagereq>
       <packagereq type="optional">revelation</packagereq>
-      <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
+      <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tellico</packagereq>
       <packagereq type="optional">texmaker</packagereq>
       <packagereq type="optional">tinyerp</packagereq>
@@ -3764,8 +3765,8 @@
     <uservisible>false</uservisible>
     <langonly>ro</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Romanian</packagereq>
       <packagereq type="conditional" requires="eclipse-platform">eclipse-nls-ro</packagereq>
+      <packagereq type="conditional" requires="kdelibs3">kde-i18n-Romanian</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ro</packagereq>
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
@@ -4033,8 +4034,8 @@
       <packagereq type="optional">kid3</packagereq>
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
-      <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">Miro</packagereq>
+      <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">muine</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nted</packagereq>
@@ -4485,8 +4486,8 @@
       <packagereq type="optional">pork</packagereq>
       <packagereq type="optional">rss2email</packagereq>
       <packagereq type="optional">rtorrent</packagereq>
-      <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">sitecopy</packagereq>
+      <packagereq type="optional">snownews</packagereq>
       <packagereq type="optional">tftp</packagereq>
       <packagereq type="optional">tin</packagereq>
       <packagereq type="optional">w3m</packagereq>
@@ -4685,8 +4686,8 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">Django</packagereq>
       <packagereq type="optional">ctemplate</packagereq>
+      <packagereq type="optional">Django</packagereq>
       <packagereq type="optional">gallery2</packagereq>
       <packagereq type="optional">php-oauth</packagereq>
       <packagereq type="optional">php-xmpphp</packagereq>
@@ -5179,110 +5180,110 @@
     </grouplist>
   </category>
   <blacklist>
-    <package name="system-config-mouse" />
-    <package name="dev" />
-    <package name="e2fsprogs" arch="i386" />
-    <package name="hal" arch="i386" />
-    <package name="mysql" arch="i386" />
-    <package name="esound" arch="i386" />
-    <package name="hpijs" arch="i386" />
-    <package name="mkinitrd" arch="i386" />
-    <package name="dbus" arch="i386" />
-    <package name="kdeaccessibility" arch="i386" />
-    <package name="kdebase" arch="i386" />
-    <package name="kdeedu" arch="i386" />
-    <package name="kdegraphics" arch="i386" />
-    <package name="kdemultimedia" arch="i386" />
-    <package name="kdemultimedia-extras" arch="i386" />
-    <package name="kdenetwork" arch="i386" />
-    <package name="kdesdk" arch="i386" />
-    <package name="kdeutils" arch="i386" />
-    <package name="kdewebdev" arch="i386" />
-    <package name="gdb" arch="i386" />
-    <package name="kmymoney2" arch="i386" />
-    <package name="gnome-applets" arch="i386" />
-    <package name="geomview" arch="i386" />
-    <package name="gnome-panel" arch="i386" />
-    <package name="nas" arch="i386" />
-    <package name="NetworkManager" arch="i386" />
-    <package name="perl" arch="i386" />
-    <package name="e2fsprogs" arch="ppc64" />
-    <package name="hal" arch="ppc64" />
-    <package name="mysql" arch="ppc64" />
-    <package name="esound" arch="ppc64" />
-    <package name="mkinitrd" arch="ppc64" />
-    <package name="dbus" arch="ppc64" />
-    <package name="hpijs" arch="ppc64" />
-    <package name="kdeaccessibility" arch="ppc64" />
-    <package name="kdebase" arch="ppc64" />
-    <package name="kdeedu" arch="ppc64" />
-    <package name="kdegraphics" arch="ppc64" />
-    <package name="kdemultimedia" arch="ppc64" />
-    <package name="kdemultimedia-extras" arch="ppc64" />
-    <package name="kdenetwork" arch="ppc64" />
-    <package name="kdesdk" arch="ppc64" />
-    <package name="kdeutils" arch="ppc64" />
-    <package name="kdewebdev" arch="ppc64" />
-    <package name="gdb" arch="ppc64" />
-    <package name="kmymoney2" arch="ppc64" />
-    <package name="gnome-applets" arch="ppc64" />
-    <package name="geomview" arch="ppc64" />
-    <package name="gnome-panel" arch="ppc64" />
-    <package name="nas" arch="ppc64" />
-    <package name="NetworkManager" arch="ppc64" />
+    <package name="dev"/>
+    <package name="system-config-mouse"/>
+    <package arch="i386" name="NetworkManager"/>
+    <package arch="i386" name="dbus"/>
+    <package arch="i386" name="e2fsprogs"/>
+    <package arch="i386" name="esound"/>
+    <package arch="i386" name="gdb"/>
+    <package arch="i386" name="geomview"/>
+    <package arch="i386" name="gnome-applets"/>
+    <package arch="i386" name="gnome-panel"/>
+    <package arch="i386" name="hal"/>
+    <package arch="i386" name="hpijs"/>
+    <package arch="i386" name="kdeaccessibility"/>
+    <package arch="i386" name="kdebase"/>
+    <package arch="i386" name="kdeedu"/>
+    <package arch="i386" name="kdegraphics"/>
+    <package arch="i386" name="kdemultimedia"/>
+    <package arch="i386" name="kdemultimedia-extras"/>
+    <package arch="i386" name="kdenetwork"/>
+    <package arch="i386" name="kdesdk"/>
+    <package arch="i386" name="kdeutils"/>
+    <package arch="i386" name="kdewebdev"/>
+    <package arch="i386" name="kmymoney2"/>
+    <package arch="i386" name="mkinitrd"/>
+    <package arch="i386" name="mysql"/>
+    <package arch="i386" name="nas"/>
+    <package arch="i386" name="perl"/>
+    <package arch="ppc64" name="NetworkManager"/>
+    <package arch="ppc64" name="dbus"/>
+    <package arch="ppc64" name="e2fsprogs"/>
+    <package arch="ppc64" name="esound"/>
+    <package arch="ppc64" name="gdb"/>
+    <package arch="ppc64" name="geomview"/>
+    <package arch="ppc64" name="gnome-applets"/>
+    <package arch="ppc64" name="gnome-panel"/>
+    <package arch="ppc64" name="hal"/>
+    <package arch="ppc64" name="hpijs"/>
+    <package arch="ppc64" name="kdeaccessibility"/>
+    <package arch="ppc64" name="kdebase"/>
+    <package arch="ppc64" name="kdeedu"/>
+    <package arch="ppc64" name="kdegraphics"/>
+    <package arch="ppc64" name="kdemultimedia"/>
+    <package arch="ppc64" name="kdemultimedia-extras"/>
+    <package arch="ppc64" name="kdenetwork"/>
+    <package arch="ppc64" name="kdesdk"/>
+    <package arch="ppc64" name="kdeutils"/>
+    <package arch="ppc64" name="kdewebdev"/>
+    <package arch="ppc64" name="kmymoney2"/>
+    <package arch="ppc64" name="mkinitrd"/>
+    <package arch="ppc64" name="mysql"/>
+    <package arch="ppc64" name="nas"/>
   </blacklist>
   <whiteout>
-    <ignoredep package="pango-gtkbeta-devel" requires="pango-gtkbeta" />
-    <ignoredep package="XFree86" requires="Mesa" />
-    <ignoredep package="xorg-x11" requires="Mesa" />
-    <ignoredep package="compat-glibc" requires="db2" />
-    <ignoredep package="compat-glibc" requires="db1" />
-    <ignoredep package="pam" requires="initscripts" />
-    <ignoredep package="initscripts" requires="sysklogd" />
-    <ignoredep package="arts" requires="kdelibs-sound" />
-    <ignoredep package="libgnomeprint15" requires="gnome-print" />
-    <ignoredep package="nautilus" requires="nautilus-mozilla" />
-    <ignoredep package="tcl" requires="postgresql-tcl" />
-    <ignoredep package="libtermcap" requires="bash" />
-    <ignoredep package="modutils" requires="vixie-cron" />
-    <ignoredep package="ypbind" requires="yp-tools" />
-    <ignoredep package="ghostscript-fonts" requires="ghostscript" />
-    <ignoredep package="usermode" requires="util-linux" />
-    <ignoredep package="control-center" requires="xscreensaver" />
-    <ignoredep package="kdemultimedia-arts" requires="kdemultimedia-libs" />
-    <ignoredep package="initscripts" requires="util-linux" />
-    <ignoredep package="XFree86-libs" requires="XFree86-Mesa-libGL" />
-    <ignoredep package="xorg-x11-libs" requires="xorg-x11-Mesa-libGL" />
-    <ignoredep package="mysql" requires="perl-DBD-MySQL" />
-    <ignoredep package="ghostscript" requires="gimp-print" />
-    <ignoredep package="bind" requires="bind-utils" />
-    <ignoredep package="perl" requires="mod_perl" />
-    <ignoredep package="perl" requires="perl-Filter" />
-    <ignoredep package="coreutils" requires="pam" />
-    <ignoredep package="perl" requires="mrtg" />
-    <ignoredep package="perl-Date-Calc" requires="perl-Bit-Vector" />
-    <ignoredep package="glibc-debug" requires="glibc-devel" />
-    <ignoredep package="xinitrc" requires="XFree86" />
-    <ignoredep package="xinitrc" requires="xorg-x11" />
-    <ignoredep package="xemacs" requires="apel-xemacs" />
-    <ignoredep package="gimp" requires="gimp-print-plugin" />
-    <ignoredep package="redhat-lsb" requires="redhat-lsb" />
-    <ignoredep package="info" requires="ncurses" />
-    <ignoredep package="aspell" requires="aspell-en" />
-    <ignoredep package="dbus" requires="dbus-glib" />
-    <ignoredep package="xemacs" requires="xemacs-sumo" />
-    <ignoredep package="ncurses" requires="gpm" />
-    <ignoredep package="cyrus-sasl" requires="openldap" />
-    <ignoredep package="lvm2" requires="kernel" />
-    <ignoredep package="initscripts" requires="kernel" />
-    <ignoredep package="initscripts" requires="kernel-smp" />
-    <ignoredep package="httpd" requires="httpd-suexec" />
-    <ignoredep package="php" requires="php-pear" />
-    <ignoredep package="gnome-python2" requires="gnome-python2-bonobo" />
-    <ignoredep package="openoffice.org-libs" requires="openoffice.org" />
-    <ignoredep package="gtk+" requires="gdk-pixbuf" />
-    <ignoredep package="nautilus" requires="nautilus-cd-burner" />
-    <ignoredep package="hicolor-icon-theme" requires="gtk2" />
-    <ignoredep package="gtk2" requires="scim-libs" />
+    <ignoredep package="XFree86" requires="Mesa"/>
+    <ignoredep package="XFree86-libs" requires="XFree86-Mesa-libGL"/>
+    <ignoredep package="arts" requires="kdelibs-sound"/>
+    <ignoredep package="aspell" requires="aspell-en"/>
+    <ignoredep package="bind" requires="bind-utils"/>
+    <ignoredep package="compat-glibc" requires="db1"/>
+    <ignoredep package="compat-glibc" requires="db2"/>
+    <ignoredep package="control-center" requires="xscreensaver"/>
+    <ignoredep package="coreutils" requires="pam"/>
+    <ignoredep package="cyrus-sasl" requires="openldap"/>
+    <ignoredep package="dbus" requires="dbus-glib"/>
+    <ignoredep package="ghostscript" requires="gimp-print"/>
+    <ignoredep package="ghostscript-fonts" requires="ghostscript"/>
+    <ignoredep package="gimp" requires="gimp-print-plugin"/>
+    <ignoredep package="glibc-debug" requires="glibc-devel"/>
+    <ignoredep package="gnome-python2" requires="gnome-python2-bonobo"/>
+    <ignoredep package="gtk+" requires="gdk-pixbuf"/>
+    <ignoredep package="gtk2" requires="scim-libs"/>
+    <ignoredep package="hicolor-icon-theme" requires="gtk2"/>
+    <ignoredep package="httpd" requires="httpd-suexec"/>
+    <ignoredep package="info" requires="ncurses"/>
+    <ignoredep package="initscripts" requires="kernel"/>
+    <ignoredep package="initscripts" requires="kernel-smp"/>
+    <ignoredep package="initscripts" requires="sysklogd"/>
+    <ignoredep package="initscripts" requires="util-linux"/>
+    <ignoredep package="kdemultimedia-arts" requires="kdemultimedia-libs"/>
+    <ignoredep package="libgnomeprint15" requires="gnome-print"/>
+    <ignoredep package="libtermcap" requires="bash"/>
+    <ignoredep package="lvm2" requires="kernel"/>
+    <ignoredep package="modutils" requires="vixie-cron"/>
+    <ignoredep package="mysql" requires="perl-DBD-MySQL"/>
+    <ignoredep package="nautilus" requires="nautilus-cd-burner"/>
+    <ignoredep package="nautilus" requires="nautilus-mozilla"/>
+    <ignoredep package="ncurses" requires="gpm"/>
+    <ignoredep package="openoffice.org-libs" requires="openoffice.org"/>
+    <ignoredep package="pam" requires="initscripts"/>
+    <ignoredep package="pango-gtkbeta-devel" requires="pango-gtkbeta"/>
+    <ignoredep package="perl" requires="mod_perl"/>
+    <ignoredep package="perl" requires="mrtg"/>
+    <ignoredep package="perl" requires="perl-Filter"/>
+    <ignoredep package="perl-Date-Calc" requires="perl-Bit-Vector"/>
+    <ignoredep package="php" requires="php-pear"/>
+    <ignoredep package="redhat-lsb" requires="redhat-lsb"/>
+    <ignoredep package="tcl" requires="postgresql-tcl"/>
+    <ignoredep package="usermode" requires="util-linux"/>
+    <ignoredep package="xemacs" requires="apel-xemacs"/>
+    <ignoredep package="xemacs" requires="xemacs-sumo"/>
+    <ignoredep package="xinitrc" requires="XFree86"/>
+    <ignoredep package="xinitrc" requires="xorg-x11"/>
+    <ignoredep package="xorg-x11" requires="Mesa"/>
+    <ignoredep package="xorg-x11-libs" requires="xorg-x11-Mesa-libGL"/>
+    <ignoredep package="ypbind" requires="yp-tools"/>
   </whiteout>
 </comps>