Исправление пунктов меню для gfxboot

profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config

@@ -1,4 +1,4 @@
-# Calculate name=system.config os_builder_linux_system==desktop
+# Calculate name=system.config os_builder_linux_system==desktop&&pkg(media-gfx/gfxboot-themes-calculate)==
 HEADER
 cld;
 #?os_builder_linux_subname!=#

profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot

@@ -0,0 +1,24 @@
+# Calculate name=system.config pkg(media-gfx/gfxboot-themes-calculate)!=
+HEADER
+cl;
+#?os_builder_linux_subname!=#
+#-os_builder_linux_name-# #-os_builder_linux_ver-# #-os_builder_linux_subname-# Live#-cl_builder_cdname-#;
+#os_builder_linux_subname#
+#?os_builder_linux_subname==#
+#-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#;
+#os_builder_linux_subname#
+/boot/vmlinuz;
+#?pkg(sys-kernel/dracut)==#root=/dev/ram0#pkg##?pkg(sys-kernel/dracut)!=#root=#-cl_builder_root_param-##pkg#;
+/boot/initrd;
+#?pkg(media-gfx/splashutils)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
+#pkg#
+#?pkg(media-gfx/plymouth-themes-calculate)!=&&pkg(media-gfx/splashutils)==#
+#-load(/bootmenu/bootparam.config)-# splash;
+#pkg#
+#?pkg(media-gfx/plymouth-themes-calculate)==&&pkg(media-gfx/splashutils)==#
+#-load(/bootmenu/bootparam.config)-# verbose;
+#pkg#
+
+
+FOOTER

profiles/templates/3.4/6_ac_builder_iso/0_bootmenu/server.config

@@ -1,4 +1,4 @@
-# Calculate name=system.config os_builder_linux_system!=desktop
+# Calculate name=system.config os_builder_linux_system!=desktop&&pkg(media-gfx/gfxboot-themes-calculate)==
 HEADER
 cds;
 #-os_builder_linux_name-# #-os_builder_linux_ver-# Live#-cl_builder_cdname-#;

profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/gfxboot.cfg

@@ -8,31 +8,31 @@ append auto=
 #?pkg(x11-base/xorg-server)!=#
 label intel=Intel (intel)
 append intel=video:intel
-applies intel=cld cld-nox cld-docache
+applies intel=cl
 label radeon=Ati Radeon Open Source (radeon)
 append radeon=video:radeon
-applies radeon=cld cld-nox cld-docache
+applies radeon=cl
 #pkg#
 #?cl_builder_videodrv_set==on#
 label fglrx=Ati Proprietary (fglrx)
 append fglrx=video:gflrx
-applies fglrx=cld cld-nox cld-docache
+applies fglrx=cl
 #cl_builder_videodrv_set#
 #?pkg(x11-base/xorg-server)!=#
 label nv=Nvidia 2D only (nv)
 append nv=video:nv
-applies nv=cld cld-nox cld-docache
+applies nv=cl
 label nouveau=Nvidia Open Source (nouveau)
 append nouveau=video:nouveau
-applies nouveau=cld cld-nox cld-docache
+applies nouveau=cl
 #pkg#
 #?cl_builder_videodrv_set==on#
 label nvidia=Nvidia Proprietary (nvidia)
 append nvidia=video:nvidia
-applies nvidia=cld cld-nox cld-docache
+applies nvidia=cl
 #cl_builder_videodrv_set#
 #?pkg(x11-base/xorg-server)!=#
 label vesa=Generic Vesa (vesa)
 append vesa=video:vesa,composite:off
-applies vesa=cld cld-nox cld-docache
+applies vesa=cl
 #pkg#

profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_BE.tr

@@ -0,0 +1 @@
+# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_BE.tr mirror

profiles/templates/3.4/6_ac_builder_iso/5_setup/media-gfx/gfxboot-themes-calculate/0-isolinux/nl_NL.tr

@@ -0,0 +1 @@
+# Calculate link=#-cl_builder_squash_path-#/usr/share/themes/gfxboot-themes-calculate/nl_NL.tr mirror