Fix merges

profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/0_Patch/patch-3.0.3/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<3.0.3||merge(xfce4-mixer)!=&&ini(update.patch)!=off&&ini(ver.patch)<3.0.3 
+# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<3.0.3||merge(xfce-extra/xfce4-mixer)!=&&ini(update.patch)!=off&&ini(ver.patch)<3.0.3 

profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/app-office/akonadi-server-1.6/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip merge(akonadi-server)!=&&ini(update.akonadi)!=off&&ini(ver.akonadi)==&&pkg(app-office/akonadi-server)>=1.6
+# Calculate append=skip merge()!=&&ini(update.akonadi)!=off&&ini(ver.akonadi)==&&pkg()>=1.6

profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/zzz_Final/.dmrc

@@ -1,2 +1,2 @@
-# Calculate path=~ pkg(lxde-base/lxdm)== name=.dmrc append=remove merge(calculate-desktop)!=
+# Calculate path=~ pkg(lxde-base/lxdm)== name=.dmrc append=remove merge(sys-apps/calculate-desktop)!=
 # To delete a file necessary when changing the system

profiles/templates/3.1/5_ac_desktop_profile/2-desktop-user/zzz_Final/.dmrc.xfce

@@ -1,4 +1,4 @@
-# Calculate path=~ pkg(lxde-base/lxdm)!=&&pkg(xfce-base/xfce4-session)!= name=.dmrc merge(calculate-desktop)!=
+# Calculate path=~ pkg(lxde-base/lxdm)!=&&pkg(xfce-base/xfce4-session)!= name=.dmrc merge(sys-apps/calculate-desktop)!=
 
 [Desktop]
 Session=xfce