From 80aba2d23a156d09093cec92e8f9c516f0a73b08 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 7 Aug 2012 16:46:46 -0400
Subject: [PATCH] Remove packages that no longer exist in F-18.

This includes pretty much all of Meego, so drop the group.
---
 comps-f18.xml.in | 187 ++++-------------------------------------------
 1 file changed, 14 insertions(+), 173 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b2f150d9..389c6328 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -48,7 +48,7 @@
       <packagereq type="default">authconfig</packagereq>
       <packagereq type="default">btrfs-progs</packagereq>
       <packagereq type="default">chkconfig</packagereq>
-      <packagereq type="default">cryptsetup-luks</packagereq>
+      <packagereq type="default">cryptsetup</packagereq>
       <packagereq type="default">device-mapper-multipath</packagereq>
       <packagereq type="default">dmraid</packagereq>
       <packagereq type="default">dosfstools</packagereq>
@@ -282,7 +282,6 @@
       <packagereq type="optional">brltty</packagereq>
       <packagereq type="optional">fbset</packagereq>
       <packagereq type="optional">gnupg2-smime</packagereq>
-      <packagereq type="optional">gpart</packagereq>
       <packagereq type="optional">gpgme</packagereq>
       <packagereq type="optional">gpm</packagereq>
       <packagereq type="optional">hardlink</packagereq>
@@ -537,7 +536,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="optional">aeolus-all</packagereq>
-      <packagereq type="optional">boxgrinder</packagereq>
+      <packagereq type="optional">rubygem-boxgrinder-core</packagereq>
       <packagereq type="optional">ceph</packagereq>
       <packagereq type="optional">deltacloud-core-all</packagereq>
       <packagereq type="optional">euca2ools</packagereq>
@@ -689,7 +688,6 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">avahi</packagereq>
-      <packagereq type="default">gdm-plugin-fingerprint</packagereq>
       <packagereq type="default">gnome-bluetooth</packagereq>
       <packagereq type="default">gnome-packagekit</packagereq>
       <packagereq type="default">libcanberra-gtk3</packagereq>
@@ -729,7 +727,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="mandatory">xfce-utils</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
       <packagereq type="mandatory">xfce4-settings</packagereq>
     </packagelist>
@@ -771,7 +768,6 @@
       <packagereq type="conditional" requires="digikam">kipi-plugins</packagereq>
       <packagereq type="conditional" requires="gimp">sane-backends-drivers-scanners</packagereq>
       <packagereq type="conditional" requires="gimp">xsane-gimp</packagereq>
-      <packagereq type="default">agave</packagereq>
       <packagereq type="default">blender</packagereq>
       <packagereq type="default">cinepaint</packagereq>
       <packagereq type="default">dia</packagereq>
@@ -782,7 +778,6 @@
       <packagereq type="default">gimp-data-extras</packagereq>
       <packagereq type="default">gimp-help</packagereq>
       <packagereq type="default">gimp-help-browser</packagereq>
-      <packagereq type="default">gimpfx-foundry</packagereq>
       <packagereq type="default">GREYCstoration</packagereq>
       <packagereq type="default">ImageMagick</packagereq>
       <packagereq type="default">inkscape</packagereq>
@@ -796,22 +791,16 @@
       <packagereq type="default">shotwell</packagereq>
       <packagereq type="default">synfig</packagereq>
       <packagereq type="default">ufraw</packagereq>
-      <packagereq type="optional">alchemy</packagereq>
       <packagereq type="optional">audacity</packagereq>
       <packagereq type="optional">calligra-karbon</packagereq>
       <packagereq type="optional">calligra-krita</packagereq>
       <packagereq type="optional">digikam</packagereq>
-      <packagereq type="optional">fyre</packagereq>
       <packagereq type="optional">gthumb</packagereq>
       <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">istanbul</packagereq>
-      <packagereq type="optional">jokosher</packagereq>
       <packagereq type="optional">openclipart</packagereq>
-      <packagereq type="optional">openoffice.org-extendedPDF</packagereq>
-      <packagereq type="optional">openoffice.org-impress</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pngcrush</packagereq>
-      <packagereq type="optional">tracker-search-tool</packagereq>
     </packagelist>
   </group>
   <group>
@@ -832,10 +821,6 @@
       <packagereq type="default">coolkey-devel</packagereq>
       <packagereq type="default">cyrus-sasl-devel</packagereq>
       <packagereq type="default">db4-devel</packagereq>
-      <packagereq type="default">dbus-cxx-devel</packagereq>
-      <packagereq type="default">dbus-cxx-doc</packagereq>
-      <packagereq type="default">dbus-cxx-glibmm-devel</packagereq>
-      <packagereq type="default">dbus-cxx-tools</packagereq>
       <packagereq type="default">dbus-devel</packagereq>
       <packagereq type="default">expat-devel</packagereq>
       <packagereq type="default">gdbm-devel</packagereq>
@@ -869,7 +854,6 @@
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
       <packagereq type="optional">DSDP-devel</packagereq>
-      <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">ffcall</packagereq>
       <packagereq type="optional">givaro-devel</packagereq>
       <packagereq type="optional">gmp-ecm-devel</packagereq>
@@ -907,8 +891,6 @@
       <packagereq type="mandatory">rpm-build</packagereq>
       <packagereq type="mandatory">strace</packagereq>
       <packagereq type="default">automake14</packagereq>
-      <packagereq type="default">automake15</packagereq>
-      <packagereq type="default">automake16</packagereq>
       <packagereq type="default">automake17</packagereq>
       <packagereq type="default">byacc</packagereq>
       <packagereq type="default">ccache</packagereq>
@@ -933,12 +915,10 @@
       <packagereq type="default">systemtap</packagereq>
       <packagereq type="default">texinfo</packagereq>
       <packagereq type="default">valgrind</packagereq>
-      <packagereq type="optional">abicheck</packagereq>
       <packagereq type="optional">alex</packagereq>
       <packagereq type="optional">alleyoop</packagereq>
       <packagereq type="optional">aplus-fsf</packagereq>
       <packagereq type="optional">archmage</packagereq>
-      <packagereq type="optional">asa</packagereq>
       <packagereq type="optional">astyle</packagereq>
       <packagereq type="optional">bigloo</packagereq>
       <packagereq type="optional">bigloo-doc</packagereq>
@@ -956,17 +936,13 @@
       <packagereq type="optional">clipsmm-doc</packagereq>
       <packagereq type="optional">clisp</packagereq>
       <packagereq type="optional">cmake</packagereq>
-      <packagereq type="optional">cmucl</packagereq>
       <packagereq type="optional">coan</packagereq>
-      <packagereq type="optional">CodeAnalyst-gui</packagereq>
       <packagereq type="optional">codeblocks</packagereq>
       <packagereq type="optional">colordiff</packagereq>
-      <packagereq type="optional">coredumper</packagereq>
       <packagereq type="optional">cpan-upload</packagereq>
       <packagereq type="optional">cpanspec</packagereq>
       <packagereq type="optional">cppunit</packagereq>
       <packagereq type="optional">cproto</packagereq>
-      <packagereq type="optional">crossvc</packagereq>
       <packagereq type="optional">curry</packagereq>
       <packagereq type="optional">cvs2cl</packagereq>
       <packagereq type="optional">cvs2svn</packagereq>
@@ -988,7 +964,6 @@
       <packagereq type="optional">fpc</packagereq>
       <packagereq type="optional">frama-c</packagereq>
       <packagereq type="optional">frysk</packagereq>
-      <packagereq type="optional">frysk-gnome</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
       <packagereq type="optional">gambas2-ide</packagereq>
       <packagereq type="optional">gappa</packagereq>
@@ -1021,13 +996,11 @@
       <packagereq type="optional">koji</packagereq>
       <packagereq type="optional">koji-hub</packagereq>
       <packagereq type="optional">koji-web</packagereq>
-      <packagereq type="optional">kuipc</packagereq>
       <packagereq type="optional">lazarus</packagereq>
       <packagereq type="optional">lcov</packagereq>
       <packagereq type="optional">libdwarf-tools</packagereq>
       <packagereq type="optional">livecd-tools</packagereq>
       <packagereq type="optional">lua</packagereq>
-      <packagereq type="optional">lush</packagereq>
       <packagereq type="optional">mach</packagereq>
       <packagereq type="optional">manedit</packagereq>
       <packagereq type="optional">mantis</packagereq>
@@ -1047,7 +1020,6 @@
       <packagereq type="optional">ocaml</packagereq>
       <packagereq type="optional">oorexx</packagereq>
       <packagereq type="optional">parrot</packagereq>
-      <packagereq type="optional">patchy</packagereq>
       <packagereq type="optional">pax-utils</packagereq>
       <packagereq type="optional">perl-perlmenu</packagereq>
       <packagereq type="optional">perltidy</packagereq>
@@ -1077,16 +1049,12 @@
       <packagereq type="optional">splint</packagereq>
       <packagereq type="optional">Sprog</packagereq>
       <packagereq type="optional">srecord</packagereq>
-      <packagereq type="optional">subcommander</packagereq>
       <packagereq type="optional">svn2cl</packagereq>
       <packagereq type="optional">svnmailer</packagereq>
       <packagereq type="optional">sysconftool</packagereq>
       <packagereq type="optional">tailor</packagereq>
-      <packagereq type="optional">tclpro</packagereq>
       <packagereq type="optional">tig</packagereq>
-      <packagereq type="optional">tkcon</packagereq>
       <packagereq type="optional">tkcvs</packagereq>
-      <packagereq type="optional">tla</packagereq>
       <packagereq type="optional">tolua++</packagereq>
       <packagereq type="optional">tortoisehg</packagereq>
       <packagereq type="optional">trac</packagereq>
@@ -1218,10 +1186,9 @@
       <packagereq type="default">eclipse-mylyn</packagereq>
       <packagereq type="default">eclipse-mylyn-context-cdt</packagereq>
       <packagereq type="default">eclipse-mylyn-context-java</packagereq>
-      <packagereq type="default">eclipse-mylyn-context-tasks-bugzilla</packagereq>
-      <packagereq type="default">eclipse-mylyn-context-tasks-trac</packagereq>
-      <packagereq type="default">eclipse-mylyn-context-tasks-web</packagereq>
       <packagereq type="default">eclipse-mylyn-tasks-bugzilla</packagereq>
+      <packagereq type="default">eclipse-mylyn-tasks-trac</packagereq>
+      <packagereq type="default">eclipse-mylyn-tasks-web</packagereq>
       <packagereq type="default">eclipse-oprofile</packagereq>
       <packagereq type="default">eclipse-packagekit</packagereq>
       <packagereq type="default">eclipse-pde</packagereq>
@@ -1243,7 +1210,6 @@
       <packagereq type="optional">eclipse-quickrex</packagereq>
       <packagereq type="optional">eclipse-rpmstubby</packagereq>
       <packagereq type="optional">eclipse-shelled</packagereq>
-      <packagereq type="optional">eclipse-slide</packagereq>
       <packagereq type="optional">eclipse-texlipse</packagereq>
       <packagereq type="optional">eclipse-veditor</packagereq>
     </packagelist>
@@ -1272,9 +1238,6 @@
       <packagereq type="optional">nedit</packagereq>
       <packagereq type="optional">poedit</packagereq>
       <packagereq type="optional">psgml</packagereq>
-      <packagereq type="optional">scite</packagereq>
-      <packagereq type="optional">scribes</packagereq>
-      <packagereq type="optional">scribes-templates</packagereq>
       <packagereq type="optional">vim-X11</packagereq>
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
@@ -1328,7 +1291,6 @@
       <packagereq type="optional">rocs</packagereq>
       <packagereq type="optional">saoimage</packagereq>
       <packagereq type="optional">skychart</packagereq>
-      <packagereq type="optional">starlab</packagereq>
       <packagereq type="optional">stellarium</packagereq>
       <packagereq type="optional">step</packagereq>
       <packagereq type="optional">tuxtype2</packagereq>
@@ -1402,7 +1364,6 @@
       <packagereq type="default">gspiceui</packagereq>
       <packagereq type="default">gtkterm</packagereq>
       <packagereq type="default">gtkwave</packagereq>
-      <packagereq type="default">gwave</packagereq>
       <packagereq type="default">hct</packagereq>
       <packagereq type="default">hiredis</packagereq>
       <packagereq type="default">irsim</packagereq>
@@ -1428,7 +1389,6 @@
       <packagereq type="default">perl-Perlilog</packagereq>
       <packagereq type="default">perl-SystemC-Vregs</packagereq>
       <packagereq type="default">perl-SystemPerl</packagereq>
-      <packagereq type="default">perl-Verilog</packagereq>
       <packagereq type="default">perl-Verilog-CodeGen</packagereq>
       <packagereq type="default">perl-Verilog-Readmem</packagereq>
       <packagereq type="default">pharosc</packagereq>
@@ -1453,7 +1413,6 @@
       <packagereq type="default">tkgate</packagereq>
       <packagereq type="default">toped</packagereq>
       <packagereq type="default">uisp</packagereq>
-      <packagereq type="default">usrp</packagereq>
       <packagereq type="default">verilator</packagereq>
       <packagereq type="default">vhd2vl</packagereq>
       <packagereq type="default">vrq</packagereq>
@@ -1502,13 +1461,11 @@
       <packagereq type="optional">cantor</packagereq>
       <packagereq type="optional">cantor-R</packagereq>
       <packagereq type="optional">cddlib</packagereq>
-      <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">chemtool</packagereq>
       <packagereq type="optional">coq</packagereq>
       <packagereq type="optional">coq-coqide</packagereq>
       <packagereq type="optional">coq-doc</packagereq>
       <packagereq type="optional">coq-emacs</packagereq>
-      <packagereq type="optional">coq-xemacs</packagereq>
       <packagereq type="optional">cryptominisat</packagereq>
       <packagereq type="optional">csdp</packagereq>
       <packagereq type="optional">csdp-tools</packagereq>
@@ -1529,12 +1486,10 @@
       <packagereq type="optional">fflas-ffpack-devel</packagereq>
       <packagereq type="optional">flint</packagereq>
       <packagereq type="optional">freefem++</packagereq>
-      <packagereq type="optional">funtools</packagereq>
       <packagereq type="optional">gabedit</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gap</packagereq>
       <packagereq type="optional">gdl</packagereq>
-      <packagereq type="optional">geant321</packagereq>
       <packagereq type="optional">genius</packagereq>
       <packagereq type="optional">geomview</packagereq>
       <packagereq type="optional">gfan</packagereq>
@@ -1553,7 +1508,6 @@
       <packagereq type="optional">gromacs</packagereq>
       <packagereq type="optional">gromacs-openmpi</packagereq>
       <packagereq type="optional">gts</packagereq>
-      <packagereq type="optional">harminv</packagereq>
       <packagereq type="optional">hdf</packagereq>
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
@@ -1583,9 +1537,7 @@
       <packagereq type="optional">netcdf</packagereq>
       <packagereq type="optional">openbabel</packagereq>
       <packagereq type="optional">opencv</packagereq>
-      <packagereq type="optional">osiv</packagereq>
       <packagereq type="optional">paraview</packagereq>
-      <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">perl-bioperl</packagereq>
       <packagereq type="optional">picosat</packagereq>
       <packagereq type="optional">picosat-devel</packagereq>
@@ -1602,13 +1554,10 @@
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
       <packagereq type="optional">qcad</packagereq>
-      <packagereq type="optional">qtiplot</packagereq>
       <packagereq type="optional">qtoctave</packagereq>
       <packagereq type="optional">root</packagereq>
       <packagereq type="optional">routino</packagereq>
       <packagereq type="optional">rrdtool</packagereq>
-      <packagereq type="optional">scidavis</packagereq>
-      <packagereq type="optional">scrip</packagereq>
       <packagereq type="optional">seaview</packagereq>
       <packagereq type="optional">sextractor</packagereq>
       <packagereq type="optional">SIBsim4</packagereq>
@@ -1622,7 +1571,6 @@
       <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
       <packagereq type="optional">vinci</packagereq>
-      <packagereq type="optional">wcstools</packagereq>
       <packagereq type="optional">wgrib</packagereq>
       <packagereq type="optional">wgrib2</packagereq>
       <packagereq type="optional">wise2</packagereq>
@@ -1728,7 +1676,6 @@
       <packagereq type="default">gimp-data-extras</packagereq>
       <packagereq type="default">gimp-help</packagereq>
       <packagereq type="default">gimp-help-browser</packagereq>
-      <packagereq type="default">gimpfx-foundry</packagereq>
       <packagereq type="default">gnome-specimen</packagereq>
       <packagereq type="default">gucharmap</packagereq>
       <packagereq type="default">inkscape</packagereq>
@@ -1919,8 +1866,6 @@
       <packagereq type="optional">grimmer-proggy-tinysz-fonts</packagereq>
       <packagereq type="optional">gubbi-fonts</packagereq>
       <packagereq type="optional">hanazono-fonts</packagereq>
-      <packagereq type="optional">hartke-aurulent-sans-fonts</packagereq>
-      <packagereq type="optional">hartke-aurulent-sans-mono-fonts</packagereq>
       <packagereq type="optional">hiran-perizia-fonts</packagereq>
       <packagereq type="optional">impallari-lobster-fonts</packagereq>
       <packagereq type="optional">inkboy-fonts</packagereq>
@@ -1956,9 +1901,6 @@
       <packagereq type="optional">khmeros-muol-fonts</packagereq>
       <packagereq type="optional">khmeros-siemreap-fonts</packagereq>
       <packagereq type="optional">kurdit-unikurd-web-fonts</packagereq>
-      <packagereq type="optional">larabie-decorative-fonts</packagereq>
-      <packagereq type="optional">larabie-straight-fonts</packagereq>
-      <packagereq type="optional">larabie-uncommon-fonts</packagereq>
       <packagereq type="optional">levien-inconsolata-fonts</packagereq>
       <packagereq type="optional">levien-museum-fonts</packagereq>
       <packagereq type="optional">liberation-narrow-fonts</packagereq>
@@ -2223,7 +2165,6 @@
       <packagereq type="optional">cave9</packagereq>
       <packagereq type="optional">cdogs-sdl</packagereq>
       <packagereq type="optional">celestia</packagereq>
-      <packagereq type="optional">cgoban</packagereq>
       <packagereq type="optional">clanbomber</packagereq>
       <packagereq type="optional">clonekeen</packagereq>
       <packagereq type="optional">coco-coq</packagereq>
@@ -2288,7 +2229,6 @@
       <packagereq type="optional">hedgewars</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kcheckers</packagereq>
-      <packagereq type="optional">kcirbshooter</packagereq>
       <packagereq type="optional">kdeaddons-atlantikdesigner</packagereq>
       <packagereq type="optional">kdegames</packagereq>
       <packagereq type="optional">kdegames3</packagereq>
@@ -2314,7 +2254,6 @@
       <packagereq type="optional">manaworld-music</packagereq>
       <packagereq type="optional">maniadrive</packagereq>
       <packagereq type="optional">maniadrive-music</packagereq>
-      <packagereq type="optional">maxr</packagereq>
       <packagereq type="optional">MegaMek</packagereq>
       <packagereq type="optional">methane</packagereq>
       <packagereq type="optional">mindless</packagereq>
@@ -2357,7 +2296,6 @@
       <packagereq type="optional">PySolFC-cardsets</packagereq>
       <packagereq type="optional">PySolFC-music</packagereq>
       <packagereq type="optional">qascade</packagereq>
-      <packagereq type="optional">qgo</packagereq>
       <packagereq type="optional">qstars</packagereq>
       <packagereq type="optional">quake3</packagereq>
       <packagereq type="optional">quake3-demo</packagereq>
@@ -2436,12 +2374,10 @@
       <packagereq type="optional">xpilot-ng</packagereq>
       <packagereq type="optional">xpilot-ng-server</packagereq>
       <packagereq type="optional">xplanet</packagereq>
-      <packagereq type="optional">xqf</packagereq>
       <packagereq type="optional">xscorch</packagereq>
       <packagereq type="optional">xstar</packagereq>
       <packagereq type="optional">xteddy</packagereq>
       <packagereq type="optional">xu4</packagereq>
-      <packagereq type="optional">yofrankie-bge</packagereq>
       <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
@@ -2522,7 +2458,6 @@
       <packagereq type="default">gnome-contacts</packagereq>
       <packagereq type="default">gnome-dictionary</packagereq>
       <packagereq type="default">gnome-disk-utility</packagereq>
-      <packagereq type="default">gnome-disk-utility-nautilus</packagereq>
       <packagereq type="default">gnome-documents</packagereq>
       <packagereq type="default">gnome-font-viewer</packagereq>
       <packagereq type="default">gnome-games</packagereq>
@@ -2560,7 +2495,6 @@
       <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">orca</packagereq>
       <packagereq type="default">PackageKit-command-not-found</packagereq>
-      <packagereq type="default">PackageKit-gtk-module</packagereq>
       <packagereq type="default">PackageKit-gtk3-module</packagereq>
       <packagereq type="default">policycoreutils-restorecond</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
@@ -2607,7 +2541,6 @@
       <packagereq type="optional">gtweakui</packagereq>
       <packagereq type="optional">gvfs-archive</packagereq>
       <packagereq type="optional">gvfs-obexftp</packagereq>
-      <packagereq type="optional">hamster-applet</packagereq>
       <packagereq type="optional">istanbul</packagereq>
       <packagereq type="optional">nautilus-actions</packagereq>
       <packagereq type="optional">nautilus-image-converter</packagereq>
@@ -2659,7 +2592,6 @@
       <packagereq type="default">gnome-common</packagereq>
       <packagereq type="default">gnome-desktop3-devel</packagereq>
       <packagereq type="default">gnome-devel-docs</packagereq>
-      <packagereq type="default">gnome-keyring-devel</packagereq>
       <packagereq type="default">gobject-introspection</packagereq>
       <packagereq type="default">gobject-introspection-devel</packagereq>
       <packagereq type="default">gtk-doc</packagereq>
@@ -2726,7 +2658,6 @@
       <packagereq type="default">empathy</packagereq>
       <packagereq type="default">evolution</packagereq>
       <packagereq type="default">evolution-help</packagereq>
-      <packagereq type="default">evolution-NetworkManager</packagereq>
       <packagereq type="default">firefox</packagereq>
       <packagereq type="default">icedtea-web</packagereq>
       <packagereq type="default">transmission-gtk</packagereq>
@@ -2734,14 +2665,11 @@
       <packagereq type="optional">arora</packagereq>
       <packagereq type="optional">azureus</packagereq>
       <packagereq type="optional">balsa</packagereq>
-      <packagereq type="optional">blam</packagereq>
-      <packagereq type="optional">blogtk</packagereq>
       <packagereq type="optional">bluefish</packagereq>
       <packagereq type="optional">checkgmail</packagereq>
       <packagereq type="optional">choqok</packagereq>
       <packagereq type="optional">claws-mail</packagereq>
       <packagereq type="optional">deluge</packagereq>
-      <packagereq type="optional">deskbar-applet</packagereq>
       <packagereq type="optional">dillo</packagereq>
       <packagereq type="optional">ekiga</packagereq>
       <packagereq type="optional">epiphany</packagereq>
@@ -2755,14 +2683,12 @@
       <packagereq type="optional">gftp</packagereq>
       <packagereq type="optional">gnash-plugin</packagereq>
       <packagereq type="optional">gnome-translate</packagereq>
-      <packagereq type="optional">gnubiff</packagereq>
       <packagereq type="optional">gtk-gnutella</packagereq>
       <packagereq type="optional">gtorrentviewer</packagereq>
       <packagereq type="optional">gwget</packagereq>
       <packagereq type="optional">gyachi</packagereq>
       <packagereq type="optional">jabbim</packagereq>
       <packagereq type="optional">jd</packagereq>
-      <packagereq type="optional">kadu</packagereq>
       <packagereq type="optional">kazehakase</packagereq>
       <packagereq type="optional">kdepim</packagereq>
       <packagereq type="optional">kdewebdev</packagereq>
@@ -2777,7 +2703,6 @@
       <packagereq type="optional">mail-notification</packagereq>
       <packagereq type="optional">meiga</packagereq>
       <packagereq type="optional">midori</packagereq>
-      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mitter</packagereq>
       <packagereq type="optional">mtr-gtk</packagereq>
       <packagereq type="optional">netactview</packagereq>
@@ -2788,20 +2713,16 @@
       <packagereq type="optional">pcmanx-gtk2</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>
-      <packagereq type="optional">putty</packagereq>
       <packagereq type="optional">qbittorrent</packagereq>
       <packagereq type="optional">qterm</packagereq>
       <packagereq type="optional">rekonq</packagereq>
       <packagereq type="optional">seamonkey</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
-      <packagereq type="optional">tangogps</packagereq>
       <packagereq type="optional">thunderbird</packagereq>
-      <packagereq type="optional">torium</packagereq>
       <packagereq type="optional">transmission-qt</packagereq>
       <packagereq type="optional">twinkle</packagereq>
       <packagereq type="optional">uget</packagereq>
@@ -2829,7 +2750,6 @@
       <packagereq type="default">sane-backends-drivers-scanners</packagereq>
       <packagereq type="default">shotwell</packagereq>
       <packagereq type="default">simple-scan</packagereq>
-      <packagereq type="optional">agave</packagereq>
       <packagereq type="optional">argyllcms</packagereq>
       <packagereq type="optional">asciio</packagereq>
       <packagereq type="optional">asymptote</packagereq>
@@ -2846,7 +2766,6 @@
       <packagereq type="optional">gifsicle</packagereq>
       <packagereq type="optional">gifview</packagereq>
       <packagereq type="optional">gipfel</packagereq>
-      <packagereq type="optional">gnome-scan</packagereq>
       <packagereq type="optional">gpp</packagereq>
       <packagereq type="optional">graphviz</packagereq>
       <packagereq type="optional">gutenprint-plugin</packagereq>
@@ -2954,7 +2873,6 @@
     <packagelist>
       <packagereq type="default">aic94xx-firmware</packagereq>
       <packagereq type="default">alsa-firmware</packagereq>
-      <packagereq type="default">ar9170-firmware</packagereq>
       <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
       <packagereq type="default">b43-openfwwf</packagereq>
@@ -2984,9 +2902,6 @@
       <packagereq type="optional">acpi</packagereq>
       <packagereq type="optional">acpitool</packagereq>
       <packagereq type="optional">cmospwd</packagereq>
-      <packagereq type="optional">ctapi-cyberjack</packagereq>
-      <packagereq type="optional">ctapi-cyberjack-pcsc</packagereq>
-      <packagereq type="optional">ctapi-cyberjack-tools</packagereq>
       <packagereq type="optional">firmware-addon-dell</packagereq>
       <packagereq type="optional">gpsd</packagereq>
       <packagereq type="optional">gpsd-clients</packagereq>
@@ -3112,11 +3027,11 @@
       <packagereq type="conditional" requires="gtk2">ibus-gtk2</packagereq>
       <packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
       <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
-      <packagereq type="conditional" requires="xfce-utils">im-chooser-xfce</packagereq>
+      <packagereq type="conditional" requires="xfce4-panel">im-chooser-xfce</packagereq>
       <packagereq type="conditional" requires="gnome-session">imsettings-gnome</packagereq>
       <packagereq type="conditional" requires="lxde-common">imsettings-lxde</packagereq>
       <packagereq type="conditional" requires="qt">imsettings-qt</packagereq>
-      <packagereq type="conditional" requires="xfce-utils">imsettings-xfce</packagereq>
+      <packagereq type="conditional" requires="xfce4-panel">imsettings-xfce</packagereq>
       <packagereq type="default">ibus-anthy</packagereq>
       <packagereq type="default">ibus-chewing</packagereq>
       <packagereq type="default">ibus-hangul</packagereq>
@@ -3147,7 +3062,6 @@
       <packagereq type="optional">input-pad</packagereq>
       <packagereq type="optional">iok</packagereq>
       <packagereq type="optional">kinput2</packagereq>
-      <packagereq type="optional">nabi</packagereq>
       <packagereq type="optional">scim-anthy</packagereq>
       <packagereq type="optional">scim-array</packagereq>
       <packagereq type="optional">scim-bridge-gtk</packagereq>
@@ -3173,7 +3087,6 @@
       <packagereq type="optional">scim-tables-chinese</packagereq>
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
       <packagereq type="optional">scim-thai</packagereq>
-      <packagereq type="optional">scim-tomoe</packagereq>
       <packagereq type="optional">uim</packagereq>
       <packagereq type="optional">uim-anthy</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
@@ -3317,7 +3230,6 @@
       <packagereq type="default">xalan-j2</packagereq>
       <packagereq type="default">xalan-j2-xsltc</packagereq>
       <packagereq type="default">xerces-j2</packagereq>
-      <packagereq type="default">xerces-j2-scripts</packagereq>
       <packagereq type="default">xml-commons-apis</packagereq>
       <packagereq type="default">xml-commons-resolver</packagereq>
       <packagereq type="optional">ant-findbugs</packagereq>
@@ -3448,7 +3360,6 @@
       <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">plasma-scriptengine-python</packagereq>
       <packagereq type="default">scribus</packagereq>
-      <packagereq type="default">svnpart</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
       <packagereq type="default">system-config-services</packagereq>
@@ -3458,12 +3369,9 @@
       <!-- kdm failsafe session (#491251) -->
       <packagereq type="default">xterm</packagereq>
       <packagereq type="optional">amarok-doc</packagereq>
-      <packagereq type="optional">basket</packagereq>
-      <packagereq type="optional">bespin</packagereq>
       <packagereq type="optional">bibletime</packagereq>
       <packagereq type="optional">calligra</packagereq>
       <packagereq type="optional">colord-kde</packagereq>
-      <packagereq type="optional">compiz-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">filelight</packagereq>
       <packagereq type="optional">juk</packagereq>
@@ -3483,7 +3391,6 @@
       <packagereq type="optional">kde-plasma-runcommand</packagereq>
       <packagereq type="optional">kde-plasma-smooth-tasks</packagereq>
       <packagereq type="optional">kde-plasma-translatoid</packagereq>
-      <packagereq type="optional">kde-plasma-xbar</packagereq>
       <packagereq type="optional">kde-plasma-yawp</packagereq>
       <packagereq type="optional">kde-wallpapers</packagereq>
       <packagereq type="optional">kdeadmin</packagereq>
@@ -3521,9 +3428,7 @@
       <packagereq type="optional">kvirc</packagereq>
       <packagereq type="optional">leonidas-kde-theme-landscape</packagereq>
       <packagereq type="optional">leonidas-kde-theme-lion</packagereq>
-      <packagereq type="optional">plasma-scriptengine-googlegadgets</packagereq>
       <packagereq type="optional">plasma-scriptengine-ruby</packagereq>
-      <packagereq type="optional">polyester</packagereq>
       <packagereq type="optional">qstardict</packagereq>
       <packagereq type="optional">qt-recordmydesktop</packagereq>
       <packagereq type="optional">qtcurve-gtk2</packagereq>
@@ -3572,7 +3477,7 @@
       <packagereq type="default">kdesdk-thumbnailers</packagereq>
       <packagereq type="default">kdesdk-umbrello</packagereq>
       <packagereq type="default">kdevelop</packagereq>
-      <packagereq type="default">PyKDE4-devel</packagereq>
+      <packagereq type="default">pykde4-devel</packagereq>
       <packagereq type="default">PyQt4-devel</packagereq>
       <packagereq type="optional">audiocd-kio-devel</packagereq>
       <packagereq type="optional">cantor-devel</packagereq>
@@ -3654,7 +3559,6 @@
       <packagereq type="optional">baekmuk-ttf-gulim-fonts</packagereq>
       <packagereq type="optional">baekmuk-ttf-hline-fonts</packagereq>
       <packagereq type="optional">lv</packagereq>
-      <packagereq type="optional">nabi</packagereq>
       <packagereq type="optional">nhn-nanum-gothic-coding-fonts</packagereq>
       <packagereq type="optional">un-core-batang-fonts</packagereq>
       <packagereq type="optional">un-core-dinaru-fonts</packagereq>
@@ -3832,7 +3736,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">compat-libgcc-296</packagereq>
       <packagereq type="default">compat-libstdc++-296</packagereq>
       <packagereq type="default">compat-libstdc++-33</packagereq>
       <packagereq type="optional">compat-db</packagereq>
@@ -3851,7 +3754,6 @@
       <packagereq type="optional">libreoffice-rhino</packagereq>
       <packagereq type="optional">libreoffice-sdk</packagereq>
       <packagereq type="optional">libreoffice-sdk-doc</packagereq>
-      <packagereq type="optional">libreoffice-testtools</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4025,33 +3927,6 @@
       <packagereq type="default">gnumed-server</packagereq>
     </packagelist>
   </group>
-  <group>
-    <id>meego-netbook</id>
-    <_name>MeeGo NetBook UX Environment</_name>
-    <_description>MeeGo NetBook UX is an desktop environment for NetBook/NetTop devices.</_description>
-    <default>false</default>
-    <uservisible>true</uservisible>
-    <packagelist>
-      <packagereq type="mandatory">bisho</packagereq>
-      <packagereq type="mandatory">meego-cursor-theme</packagereq>
-      <packagereq type="mandatory">meego-panel-applications</packagereq>
-      <packagereq type="mandatory">meego-panel-datetime</packagereq>
-      <packagereq type="mandatory">meego-panel-devices</packagereq>
-      <packagereq type="mandatory">meego-panel-myzone</packagereq>
-      <packagereq type="mandatory">meego-panel-pasteboard</packagereq>
-      <packagereq type="mandatory">meego-panel-people</packagereq>
-      <packagereq type="mandatory">meego-panel-status</packagereq>
-      <packagereq type="mandatory">meego-panel-zones</packagereq>
-      <packagereq type="mandatory">meego-sound-theme</packagereq>
-      <packagereq type="mandatory">moblin-app-installer</packagereq>
-      <packagereq type="mandatory">moblin-gtk-engine</packagereq>
-      <packagereq type="mandatory">moblin-icon-theme</packagereq>
-      <packagereq type="mandatory">network-manager-netbook</packagereq>
-      <packagereq type="mandatory">uxlaunch</packagereq>
-      <packagereq type="default">evolution</packagereq>
-      <packagereq type="optional">syncevolution-meego</packagereq>
-    </packagelist>
-  </group>
   <group>
     <id>milkymist</id>
     <_name>Milkymist</_name>
@@ -4066,7 +3941,7 @@
       <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">avr-libc-doc</packagereq>
       <packagereq type="default">clang</packagereq>
       <packagereq type="default">flterm</packagereq>
       <packagereq type="default">gcc</packagereq>
@@ -4113,10 +3988,10 @@
       <packagereq type="optional">mingw32-gdbm</packagereq>
       <packagereq type="optional">mingw32-gettext</packagereq>
       <packagereq type="optional">mingw32-glib2</packagereq>
-      <packagereq type="optional">mingw32-iconv</packagereq>
+      <packagereq type="optional">mingw32-win-iconv</packagereq>
       <packagereq type="optional">mingw32-libgcrypt</packagereq>
       <packagereq type="optional">mingw32-libgpg-error</packagereq>
-      <packagereq type="optional">mingw32-libjpeg</packagereq>
+      <packagereq type="optional">mingw32-libjpeg-turbo</packagereq>
       <packagereq type="optional">mingw32-libpng</packagereq>
       <packagereq type="optional">mingw32-libxml2</packagereq>
       <packagereq type="optional">mingw32-openssl</packagereq>
@@ -4145,7 +4020,6 @@
       <packagereq type="default">mysql-server</packagereq>
       <packagereq type="default">perl-DBD-MySQL</packagereq>
       <packagereq type="default">unixODBC</packagereq>
-      <packagereq type="optional">mod_auth_mysql</packagereq>
       <packagereq type="optional">mysql-bench</packagereq>
       <packagereq type="optional">mysql-devel</packagereq>
       <packagereq type="optional">mysqlreport</packagereq>
@@ -4181,7 +4055,6 @@
       <packagereq type="optional">389-ds-base</packagereq>
       <packagereq type="optional">amanda-server</packagereq>
       <packagereq type="optional">cobbler</packagereq>
-      <packagereq type="optional">ctrlproxy</packagereq>
       <packagereq type="optional">dhcp</packagereq>
       <packagereq type="optional">dnsmasq</packagereq>
       <packagereq type="optional">ejabberd</packagereq>
@@ -4303,12 +4176,8 @@
       <packagereq type="optional">calligra-stage</packagereq>
       <packagereq type="optional">calligra-words</packagereq>
       <packagereq type="optional">cherrytree</packagereq>
-      <packagereq type="optional">contacts</packagereq>
-      <packagereq type="optional">dates</packagereq>
       <packagereq type="optional">dayplanner</packagereq>
       <packagereq type="optional">dia</packagereq>
-      <packagereq type="optional">gbirthday</packagereq>
-      <packagereq type="optional">gdeskcal</packagereq>
       <packagereq type="optional">glabels</packagereq>
       <packagereq type="optional">glom</packagereq>
       <packagereq type="optional">gnucash</packagereq>
@@ -4329,7 +4198,6 @@
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">kreetingkard</packagereq>
       <packagereq type="optional">kreetingkard_templates</packagereq>
-      <packagereq type="optional">labyrinth</packagereq>
       <packagereq type="optional">libreoffice-base</packagereq>
       <packagereq type="optional">libreoffice-emailmerge</packagereq>
       <packagereq type="optional">libreoffice-javafilter</packagereq>
@@ -4340,7 +4208,6 @@
       <packagereq type="optional">libreoffice-wiki-publisher</packagereq>
       <packagereq type="optional">lyx</packagereq>
       <packagereq type="optional">MagicPoint</packagereq>
-      <packagereq type="optional">notecase</packagereq>
       <packagereq type="optional">okular</packagereq>
       <packagereq type="optional">openoffice.org-ooolatex</packagereq>
       <packagereq type="optional">pybliographer</packagereq>
@@ -4350,14 +4217,11 @@
       <packagereq type="optional">Saaghar</packagereq>
       <packagereq type="optional">skrooge</packagereq>
       <packagereq type="optional">starcal</packagereq>
-      <packagereq type="optional">sunbird</packagereq>
       <packagereq type="optional">taskcoach</packagereq>
       <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tellico</packagereq>
       <packagereq type="optional">tetex-IEEEtran</packagereq>
       <packagereq type="optional">texmaker</packagereq>
-      <packagereq type="optional">tinyerp</packagereq>
-      <packagereq type="optional">tinyerp-server</packagereq>
       <packagereq type="optional">vym</packagereq>
       <packagereq type="optional">wyrd</packagereq>
       <packagereq type="optional">xchm</packagereq>
@@ -4412,7 +4276,6 @@
       <packagereq type="optional">parrot</packagereq>
       <packagereq type="optional">perl-Task-Catalyst</packagereq>
       <packagereq type="optional">vim-perl-support</packagereq>
-      <packagereq type="optional">vim-perl-tt2</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4582,7 +4445,7 @@
       <packagereq type="mandatory">ruby</packagereq>
       <packagereq type="default">ruby-devel</packagereq>
       <packagereq type="optional">eruby</packagereq>
-      <packagereq type="optional">ruby-ri</packagereq>
+      <packagereq type="optional">rubygem-rdoc</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4809,7 +4672,6 @@
       <packagereq type="optional">cdlabelgen</packagereq>
       <packagereq type="optional">cdrskin</packagereq>
       <packagereq type="optional">cmusphinx3</packagereq>
-      <packagereq type="optional">cowbell</packagereq>
       <packagereq type="optional">csound-gui</packagereq>
       <packagereq type="optional">decibel-audio-player</packagereq>
       <packagereq type="optional">denemo</packagereq>
@@ -4822,7 +4684,6 @@
       <packagereq type="optional">festvox-bdl-arctic-hts</packagereq>
       <packagereq type="optional">festvox-clb-arctic-hts</packagereq>
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
-      <packagereq type="optional">gcdmaster</packagereq>
       <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
@@ -4844,13 +4705,11 @@
       <packagereq type="optional">lxmusic</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">milkytracker</packagereq>
-      <packagereq type="optional">Miro</packagereq>
       <packagereq type="optional">mkvtoolnix-gui</packagereq>
       <packagereq type="optional">multimedia-menus</packagereq>
       <packagereq type="optional">mybashburn</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">openfst-tools</packagereq>
-      <packagereq type="optional">padevchooser</packagereq>
       <packagereq type="optional">paman</packagereq>
       <packagereq type="optional">paprefs</packagereq>
       <packagereq type="optional">parole</packagereq>
@@ -4871,7 +4730,6 @@
       <packagereq type="optional">rosegarden4</packagereq>
       <packagereq type="optional">soundconverter</packagereq>
       <packagereq type="optional">soundtracker</packagereq>
-      <packagereq type="optional">subtitlecomposer</packagereq>
       <packagereq type="optional">sweep</packagereq>
       <packagereq type="optional">tagtool</packagereq>
       <packagereq type="optional">tclabc</packagereq>
@@ -4942,7 +4800,6 @@
       <packagereq type="optional">qt3-ODBC</packagereq>
       <packagereq type="optional">qt3-PostgreSQL</packagereq>
       <packagereq type="optional">tcl-pgtcl</packagereq>
-      <packagereq type="optional">unixODBC-kde</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5188,7 +5045,6 @@
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>
       <packagereq type="optional">smart-gui</packagereq>
-      <packagereq type="optional">snort</packagereq>
       <packagereq type="optional">socat</packagereq>
       <packagereq type="optional">stripesnoop</packagereq>
       <packagereq type="optional">swaks</packagereq>
@@ -5208,10 +5064,8 @@
       <packagereq type="optional">upx</packagereq>
       <packagereq type="optional">uucp</packagereq>
       <packagereq type="optional">vbetool</packagereq>
-      <packagereq type="optional">viaideinfo</packagereq>
       <packagereq type="optional">vlock</packagereq>
       <packagereq type="optional">vnstat</packagereq>
-      <packagereq type="optional">wifiroamd</packagereq>
       <packagereq type="optional">wine</packagereq>
       <packagereq type="optional">wireshark-gnome</packagereq>
       <packagereq type="optional">wlassistant</packagereq>
@@ -5293,7 +5147,6 @@
       <packagereq type="optional">maildirproc</packagereq>
       <packagereq type="optional">naim</packagereq>
       <packagereq type="optional">ncftp</packagereq>
-      <packagereq type="optional">netstiff</packagereq>
       <packagereq type="optional">ninja</packagereq>
       <packagereq type="optional">nmh</packagereq>
       <packagereq type="optional">offlineimap</packagereq>
@@ -5473,7 +5326,6 @@
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="default">virt-manager</packagereq>
       <packagereq type="default">virt-viewer</packagereq>
-      <packagereq type="optional">guestfish</packagereq>
       <packagereq type="optional">guestfs-browser</packagereq>
       <packagereq type="optional">libguestfs-tools</packagereq>
       <packagereq type="optional">python-libguestfs</packagereq>
@@ -5510,7 +5362,6 @@
       <packagereq type="default">distcache</packagereq>
       <packagereq type="default">httpd-manual</packagereq>
       <packagereq type="default">mod_perl</packagereq>
-      <packagereq type="default">mod_python</packagereq>
       <packagereq type="default">mod_ssl</packagereq>
       <packagereq type="default">php</packagereq>
       <packagereq type="default">php-ldap</packagereq>
@@ -5533,17 +5384,12 @@
       <packagereq type="optional">lighttpd</packagereq>
       <packagereq type="optional">lighttpd-fastcgi</packagereq>
       <packagereq type="optional">mediawiki</packagereq>
-      <packagereq type="optional">mod_authz_ldap</packagereq>
       <packagereq type="optional">mod_auth_kerb</packagereq>
-      <packagereq type="optional">mod_auth_mysql</packagereq>
-      <packagereq type="optional">mod_auth_pgsql</packagereq>
-      <packagereq type="optional">mod_cband</packagereq>
       <packagereq type="optional">mod_fcgid</packagereq>
       <packagereq type="optional">mod_geoip</packagereq>
       <packagereq type="optional">mod_security</packagereq>
       <packagereq type="optional">mod_xsendfile</packagereq>
       <packagereq type="optional">moin</packagereq>
-      <packagereq type="optional">moin-latex</packagereq>
       <packagereq type="optional">ocspd</packagereq>
       <packagereq type="optional">perl-HTML-Mason</packagereq>
       <packagereq type="optional">perl-Kwiki</packagereq>
@@ -5554,13 +5400,12 @@
       <packagereq type="optional">phpMyAdmin</packagereq>
       <packagereq type="optional">pootle</packagereq>
       <packagereq type="optional">Pound</packagereq>
-      <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
       <packagereq type="optional">tiquit</packagereq>
       <packagereq type="optional">tomcat-native</packagereq>
-      <packagereq type="optional">tomcat5</packagereq>
-      <packagereq type="optional">tomcat5-admin-webapps</packagereq>
-      <packagereq type="optional">tomcat5-webapps</packagereq>
+      <packagereq type="optional">tomcat</packagereq>
+      <packagereq type="optional">tomcat-admin-webapps</packagereq>
+      <packagereq type="optional">tomcat-webapps</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
       <packagereq type="optional">wordpress</packagereq>
@@ -5665,7 +5510,6 @@
     <packagelist>
       <packagereq type="mandatory">desktop-backgrounds-compat</packagereq>
       <packagereq type="mandatory">Thunar</packagereq>
-      <packagereq type="mandatory">xfce-utils</packagereq>
       <packagereq type="mandatory">xfce4-panel</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
       <packagereq type="mandatory">xfce4-settings</packagereq>
@@ -5728,7 +5572,6 @@
       <packagereq type="optional">xfce4-screenshooter-plugin</packagereq>
       <packagereq type="optional">xfce4-sensors-plugin</packagereq>
       <packagereq type="optional">xfce4-smartbookmark-plugin</packagereq>
-      <packagereq type="optional">xfce4-stopwatch-plugin</packagereq>
       <packagereq type="optional">xfce4-systemload-plugin</packagereq>
       <packagereq type="optional">xfce4-taskmanager</packagereq>
       <packagereq type="optional">xfce4-time-out-plugin</packagereq>
@@ -5738,7 +5581,6 @@
       <packagereq type="optional">xfce4-wavelan-plugin</packagereq>
       <packagereq type="optional">xfce4-weather-plugin</packagereq>
       <packagereq type="optional">xfce4-websearch-plugin</packagereq>
-      <packagereq type="optional">xfce4-xfapplet-plugin</packagereq>
       <packagereq type="optional">xfce4-xfswitch-plugin</packagereq>
       <packagereq type="optional">xfce4-xkb-plugin</packagereq>
       <packagereq type="optional">xfmpc</packagereq>
@@ -5869,7 +5711,6 @@
       <groupid>gnome-desktop</groupid>
       <groupid>kde-desktop</groupid>
       <groupid>lxde-desktop</groupid>
-      <groupid>meego-netbook</groupid>
       <groupid>sugar-desktop</groupid>
       <groupid>window-managers</groupid>
       <groupid>xfce-desktop</groupid>