--- a/packages.xml	Wed Jul 06 03:54:09 2011 +0100
+++ b/packages.xml	Sun Jul 17 03:06:02 2011 +0100
@@ -22,12 +22,12 @@
 	 and analogously for libraries. -->
     <name>SFEgccruntime</name>
     <ips_package_name>runtime/gcc</ips_package_name>
-    <group>System/Libraries</group>
+    <group>Development/C</group>
   </pkg>
   <pkg filename="SFEgcc-46.spec">
     <name>SFEgcc-46-runtime</name>
     <ips_package_name>runtime/gcc-46</ips_package_name>
-    <group>System/Libraries</group>
+    <group>Development/C</group>
   </pkg>
   <pkg>
     <name>SFEyasm</name>
@@ -75,6 +75,11 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
+    <name>SFEqemu.spec</name>
+    <ips_package_name>runtime/qemu</ips_package_name>
+    <group>System/Virtualization</group>
+  </pkg>
+  <pkg>
     <name>SFEpython3</name>
     <ips_package_name>runtime/python-32</ips_package_name>
   </pkg>
@@ -109,6 +114,11 @@
     <ips_package_name>system/library/g++/boost</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
+  <pkg skip="true"> <!-- Not clear why jurikm created this: it's in the system -->
+    <name>SFElibgc</name>
+    <ips_package_name>library/gc</ips_package_name>
+    <group>Development/C++</group>
+  </pkg>
   <pkg>
     <name>SFEorc</name>
     <ips_package_name>system/library/orc</ips_package_name>
@@ -159,11 +169,11 @@
   <!-- Perl modules -->
   <pkg>
     <name>SFEperl-xml-parser</name>
-    <ips_package_name>library/perl5/xml-parser</ips_package_name>
+    <ips_package_name>library/perl-5/xml-parser</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEperl-xml-xpath</name>
-    <ips_package_name>library/perl5/xml-xpath</ips_package_name>
+    <ips_package_name>library/perl-5/xml-xpath</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEperl-uri</name>
@@ -709,11 +719,19 @@
     <ips_package_name>library/video/liveMedia</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
-  <pkg encumbered="true">
+  <pkg encumbered="true" filename="encumbered/SFEffmpeg-sse2-only.spec">
     <name>SFEffmpeg</name>
     <ips_package_name>library/video/ffmpeg</ips_package_name>
+  </pkg>
+  <pkg>
+    <name>SFEliveMedia</name>
+    <ips_package_name>library/video/liveMedia</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
+  <pkg>
+    <name>SFElibass</name>
+    <ips_package_name>library/video/libass</ips_package_name>
+  </pkg>
   <pkg encumbered="true">
     <name>SFEmplayer</name>
     <ips_package_name>media/mplayer</ips_package_name>
@@ -726,7 +744,7 @@
     <ips_package_name>media/mplayer2</ips_package_name>
     <group>Applications/Sound and Video</group>
   </pkg>
-  <pkg encumbered="true">
+  <pkg encumbered="true" filename="encumbered/SFEmplayer-snap.spec">
     <name>SFEsmplayer</name>
     <ips_package_name>media/smplayer</ips_package_name>
     <group>Applications/Sound and Video</group>
@@ -952,6 +970,11 @@
     <group>Applications/System Utilities</group>
   </pkg>
   <pkg>
+    <name>SFEclamav</name>
+    <ips_package_name>diagnostic/clamav</ips_package_name>
+    <group>Applications/System Utilities</group>
+  </pkg>
+  <pkg>
     <name>SFEscalpel</name>
     <ips_package_name>file/scalpel</ips_package_name>
     <group>Applications/System Utilities</group>
@@ -1044,13 +1067,24 @@
     <summary>ICAP server implementation</summary>
   </pkg>
   <pkg>
+    <name>SFEc-icap-modules</name>
+    <ips_package_name>web/proxy/c-icap/modules</ips_package_name>
+    <group>Web Services/Application and Web Servers</group>
+    <summary>Modules for the C-ICAP server</summary>
+  </pkg>
+  <pkg>
     <name>SFExchat</name>
     <ips_package_name>desktop/irc/xchat</ips_package_name>
     <group>Applications/Internet</group>
   </pkg>
   <pkg>
     <name>SFEweechat</name>
-    <ips_package_name>desktop/irc/weechat</ips_package_name>
+    <ips_package_name>communication/irc/weechat</ips_package_name>
+    <group>Applications/Internet</group>
+  </pkg>
+  <pkg>
+    <name>SFEgajim</name>
+    <ips_package_name>communication/jabber/gajim</ips_package_name>
     <group>Applications/Internet</group>
   </pkg>
 
@@ -1074,6 +1108,18 @@
     <summary>A lockdown editor for GNOME</summary>
   </pkg>
   <pkg>
+    <name>SFEfvwm</name>
+    <ips_package_name>desktop/window-manager/fvwm</ips_package_name>
+    <group>Desktop (GNOME)/Window Managers</group>
+    <summary>F Virtual Window Manager</summary>
+  </pkg>
+  <pkg>
+    <name>SFEfvwmthemes</name>
+    <ips_package_name>desktop/window-manager/fvwm/themes</ips_package_name>
+    <group>Desktop (GNOME)/Window Managers</group>
+    <summary>F Virtual Window Manager</summary>
+  </pkg>
+  <pkg>
     <name>SFEemerald</name>
     <ips_package_name>desktop/window-manager/emerald</ips_package_name>
     <group>Desktop (GNOME)/Window Managers</group>
@@ -1084,6 +1130,11 @@
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
   <pkg>
+    <name>SFElibstroke</name>
+    <ips_package_name>library/desktop/libstroke</ips_package_name>
+    <group>Desktop (GNOME)/Libraries</group>
+  </pkg>
+  <pkg>
     <name>SFEfltk2</name>
     <ips_package_name>library/desktop/fltk</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>