Доработан новый формат тем (использование ini.env)

7 years ago · 456ccc2e2c
parent 035c468175
commit 456ccc2e2c
60 changed files with 243 additions and 63 deletions
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r1.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r1.ebuild
@ -38,9 +38,9 @@ SRC_URI="
 	)
 	"

-RDEPEND=""
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"

-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

 S="${WORKDIR}"

--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r1.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r1.ebuild
@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/calculate/dm-login-${PV}
 	ftp://ftp.calculate-linux.org/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PV}.jpg
 	http://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PV}.jpg"

-DEPEND=""
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"

 RDEPEND="${DEPEND}"

--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
@ -15,9 +15,10 @@ IUSE=""
 SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"

-RDEPEND="media-gfx/gfxboot"
+DEPEND="media-gfx/gfxboot
+	!<sys-apps/calculate-utils-3.5.2.6"

-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"

 src_compile() {
 	emake -j1
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r1.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r1.ebuild
@ -15,7 +15,7 @@ IUSE=""
 SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/calculate/grub-17.png -> ${P}.png
 	http://mirror.yandex.ru/calculate/themes/calculate/grub-17.png -> ${P}.png"

-DEPEND=""
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"

 RDEPEND="${DEPEND}"

--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r1.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r1.ebuild
@ -19,7 +19,9 @@ SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-silent-
 	ftp://ftp.calculate-linux.org/calculate/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg
 	http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg"

-DEPEND=""
+DEPEND="media-gfx/splashutils
+	media-fonts/droid
+	!<sys-apps/calculate-utils-3.5.2.6"

 RDEPEND="${DEPEND}"

--- a/profiles/ini.env
+++ b/profiles/ini.env
@ -51,15 +51,15 @@ wm-panel-menu-position = bottom
 # The size of the Quick Launch toolbar (cldm, cldx)
 wm-panel-menu-size = 56

-[splash]
-dm-login = /usr/share/themes/Calculate/dm-login.jpg
-dm-splash = /usr/share/themes/Calculate/dm-splash.jpg
-gfxboot = /usr/share/themes/Calculate/gfxboot.jpg
-grub = /usr/share/themes/Calculate/grub.png
-splash-shutdown = /usr/share/themes/Calculate/splash-shutdown.jpg
-splash-silent = /usr/share/themes/Calculate/splash-silent.jpg
-splash-verbose = /usr/share/themes/Calculate/splash-verbose.jpg
-wallpaper = /usr/share/themes/Calculate/wallpaper.jpg
+[theme]
+dm-login-background = /usr/share/themes/Calculate/dm-login.jpg
+dm-splash-background = /usr/share/themes/Calculate/dm-splash.jpg
+gfxboot-background = /usr/share/themes/Calculate/gfxboot.jpg
+grub-background = /usr/share/themes/Calculate/grub.png
+splash-shutdown-background = /usr/share/themes/Calculate/splash-shutdown.jpg
+splash-silent-background = /usr/share/themes/Calculate/splash-silent.jpg
+splash-verbose-background = /usr/share/themes/Calculate/splash-verbose.jpg
+profile-background = /usr/share/themes/Calculate/wallpaper.jpg

 [system]
 # Remove old kernel from /boot, /lib/modules
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/gfxboot-themes-calculate/.calculate_directory
@ -1 +1 @@
-# Calculate mergepkg()>=17-r1&&cl_ver>=3.5.2.5 append=skip
+# Calculate mergepkg()>=17-r1&&cl_ver>=3.5.2.6 append=skip
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/.calculate_directory
@ -1,2 +1,2 @@
-# Calculate path=/etc/runlevels exists(/usr/share/themes/Calculate/splash-verbose.jpg)!=
+# Calculate path=/etc/runlevels

--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor
@ -1 +1 @@
-# Calculate link=/etc/init.d/fbcondecor symbolic
+# Calculate ini(theme.splash-verbose-background)!=&&exists(#-ini(theme.splash-verbose-background)-#)!= link=/etc/init.d/fbcondecor symbolic
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/boot/fbcondecor.del
@ -0,0 +1 @@
+# Calculate ini(theme.splash-verbose-background)==||exists(#-ini(theme.splash-verbose-background)-#)== append=remove name=fbcondecor
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/fbcondecor
@ -1,3 +1,3 @@
-# Calculate format=openrc exists(/usr/share/themes/Calculate/splash-verbose.jpg)!=
+# Calculate format=openrc ini(theme.splash-verbose-background)!=&&exists(#-ini(theme.splash-verbose-background)-#)!=

 FBCONDECOR_TTY_MAP="1:calculate"
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/conf.d/splash
@ -1,7 +1,18 @@
 # Calculate format=openrc
 SPLASH_VERBOSE_ON_ERRORS="no"
-#?pkg(media-gfx/splash-themes-calculate)>=14#
+#?pkg(media-gfx/splash-themes-calculate)=>14,17-r1#
 SPLASH_THEME="calculate"
 _splash_theme="calculate"
 SPLASH_THEME_SHUTDOWN="calculate_shutdown"
+#!pkg#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
+SPLASH_THEME="calculate"
+_splash_theme="calculate"
+#exists#
+#?exists(#-ini(theme.splash-shutdown-background)-#)!=#
+SPLASH_THEME_SHUTDOWN="calculate_shutdown"
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)==&&exists(#-ini(theme.splash-shutdown-background)-#)==#
+SPLASH_THEME_SHUTDOWN="calculate"
+#exists#
 #pkg#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/.calculate_directory
@ -1 +1 @@
-# Calculate path=/etc name=splash cl_ver>=3.5.2.5&&pkg(media-gfx/splash-themes-calculate)>=17-r1
+# Calculate path=/etc name=splash cl_ver>=3.5.2.6
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/.calculate_directory
@ -0,0 +1 @@
+# Calculate exists(#-ini(theme.splash-silent-background)-#)!=||exists(#-ini(theme.splash-verbose-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x576.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1024x576.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1024x576.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 575 1024 576 #cdc481
 box silent 0 575 1024 576 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x600.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1024x600.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1024x600.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 599 1024 600 #cdc481
 box silent 0 599 1024 600 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1024x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1024x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1024x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1024 768 #cdc481
 box silent 0 766 1024 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1200x800.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1200x800.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1200x800.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 798 1200 800 #cdc481
 box silent 0 798 1200 800 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x1024.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1280x1024.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1280x1024.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1022 1280 1024 #cdc481
 box silent 0 1022 1280 1024 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x720.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1280x720.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1280x720.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 719 1280 720 #cdc481
 box silent 0 719 1280 720 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1280x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1280x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1280 768 #cdc481
 box silent 0 766 1280 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1280x800.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1280x800.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1280x800.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 798 1280 800 #cdc481
 box silent 0 798 1280 800 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1360x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1360x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1360x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1360 768 #cdc481
 box silent 0 766 1360 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1366x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1366x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1366x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1366 768 #cdc481
 box silent 0 766 1366 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1368x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1368x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1368x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1368 768 #cdc481
 box silent 0 766 1368 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1400x1050.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1400x1050.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1400x1050.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1048 1400 1050 #cdc481
 box silent 0 1048 1400 1050 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1440x900.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1440x900.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1440x900.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 898 1440 900 #cdc481
 box silent 0 898 1440 900 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x1200.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1600x1200.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1600x1200.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1197 1600 1200 #cdc481
 box silent 0 1197 1600 1200 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x768.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1600x768.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1600x768.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 766 1600 768 #cdc481
 box silent 0 766 1600 768 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1600x900.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1600x900.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1600x900.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 898 1600 900 #cdc481
 box silent 0 898 1600 900 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x1050.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1680x1050.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1680x1050.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1048 1680 1050 #cdc481
 box silent 0 1048 1680 1050 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1680x945.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1680x945.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1680x945.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 943 1680 945 #cdc481
 box silent 0 943 1680 945 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1080.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1920x1080.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1920x1080.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1077 1920 1080 #cdc481
 box silent 0 1077 1920 1080 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/1920x1200.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-1920x1200.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-1920x1200.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1197 1920 1200 #cdc481
 box silent 0 1197 1920 1200 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2048x1152.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-2048x1152.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-2048x1152.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1149 2048 1152 #cdc481
 box silent 0 1149 2048 1152 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1440.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-2560x1440.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-2560x1440.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1437 2560 1440 #cdc481
 box silent 0 1437 2560 1440 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/2560x1600.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-2560x1600.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-2560x1600.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 1596 2560 1600 #cdc481
 box silent 0 1596 2560 1600 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/640x480.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-640x480.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-640x480.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 479 640 480 #cdc481
 box silent 0 479 640 480 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x480.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-800x480.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-800x480.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 479 800 480 #cdc481
 box silent 0 479 800 480 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/800x600.cfg
@ -1,9 +1,14 @@
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-800x600.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-800x600.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 599 800 600 #cdc481
 box silent 0 599 800 600 #5a1d08
+#exists#
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/images.silent
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/images.silent
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate/images name=silent- link=/usr/share/themes/Calculate/splash-silent.jpg
+# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate/images name=silent- link=#-ini(theme.splash-silent-background)-# exists(#-ini(theme.splash-silent-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/images.verbose
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/images.verbose
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate/images name=verbose- link=/usr/share/themes/Calculate/splash-verbose.jpg
+# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate/images name=verbose- link=#-ini(theme.splash-verbose-background)-# exists(#-ini(theme.splash-verbose-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate/template.sh
@ -13,11 +13,16 @@ cat >$fn <<EOF
 # Calculate comment=#

 # background image
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 silentpic=images/silent-${resol}.jpg
+#exists#
+#?exists(#-ini(theme.splash-verbose-background)-#)!=#
 pic=images/verbose-${resol}.jpg
-
+#exists#
+#?exists(#-ini(theme.splash-silent-background)-#)!=#
 # progress bar for silent mode
 box silent inter 0 ${boxtop} ${width} ${height} #cdc481
 box silent 0 ${boxtop} ${width} ${height} #5a1d08
+#exists#
 EOF
 done
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/.calculate_directory
@ -0,0 +1 @@
+# Calculate exists(#-ini(theme.splash-shutdown-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/images.shutdown
+++ b/profiles/templates/3.5/2_ac_install_merge/media-gfx/splashutils/splash-themes/calculate_shutdown/images.shutdown
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate_shutdown/images name=silent- link=/usr/share/themes/Calculate/splash-shutdown.jpg
+# Calculate format=backgrounds convert=jpg path=/etc/splash/calculate_shutdown/images name=silent- link=#-ini(theme.splash-shutdown-background)-#
--- a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip cl_ver>=3.5.2.5
+# Calculate append=skip cl_ver>=3.5.2.6&&exists(#-ini(theme.grub-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-boot/grub/background/grub-calculate.png
@ -1,2 +1,2 @@
-# Calculate format=backgrounds convert=png stretch path=/boot/grub name=grub-calculate.png link=/usr/share/themes/Calculate/grub.png
+# Calculate format=backgrounds convert=png stretch path=/boot/grub name=grub-calculate.png link=#-ini(theme.grub-background)-#
 1920x1440
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/.calculate_directory
@ -1 +1 @@
-# Calculate cl_ver>=3.5.2.5&&pkg(media-gfx/calculate-wallpapers)>=17-r1 path=/usr/share
+# Calculate cl_ver>=3.5.2.6 path=/usr/share
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/.calculate_directory
@ -1 +1 @@
-# Calculate exists(/usr/share/themes/Calculate/dm-login.jpg)!=
+# Calculate exists(#-ini(theme.dm-login-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-dm/images
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate-dm/contents/images name= link=/usr/share/themes/Calculate/dm-login.jpg
+# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate-dm/contents/images name= link=#-ini(theme.dm-login-background)-#
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/.calculate_directory
@ -1 +1 @@
-# Calculate exists(/usr/share/themes/Calculate/dm-splash.jpg)!=
+# Calculate exists(#-ini(theme.dm-splash-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate-splash/images
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate-splash/contents/images name= link=/usr/share/themes/Calculate/dm-splash.jpg
+# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate-splash/contents/images name= link=#-ini(theme.dm-splash-background)-#
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/.calculate_directory
@ -1 +1 @@
-# Calculate exists(/usr/share/themes/Calculate/wallpaper.jpg)!=
+# Calculate exists(#-ini(theme.profile-background)-#)!=
--- a/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
+++ b/profiles/templates/3.5/2_ac_install_merge/x11-base/xorg-server/wallpapers/Calculate_Linux/images
@ -1 +1 @@
-# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate_Linux/contents/images name= link=/usr/share/themes/Calculate/wallpaper.jpg
+# Calculate format=backgrounds convert=jpg path=/usr/share/wallpapers/Calculate_Linux/contents/images name= link=#-ini(theme.profile-background)-#
--- a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/.calculate_directory
+++ b/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate mergepkg()>=15 path=/usr/share name=wallpapers
-
--- a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png
+++ b/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png
--- a/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png.livecd
+++ b/profiles/templates/3.5/3_ac_install_live/1-merge/media-gfx/dm-themes-calculate/dm-background.png.livecd
--- a/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils
+++ b/profiles/templates/3.5/6_ac_update_sync/revision/2017/20170310-fix_splashutils
@ -0,0 +1,6 @@
+# Calculate format=contents ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-#
+
+#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
+#?exists(/etc/conf.d/fbcondecor)==#
+!media-gfx/splashutils /etc/conf.d/fbcondecor
+#pkg#
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@ -80,6 +80,7 @@ DIST calculate-lib-3.5.2.1.tar.bz2 181839 SHA256 219695ea1981e663e49b5d6891cc904
 DIST calculate-lib-3.5.2.2.tar.bz2 181638 SHA256 1601901fa2c1c32d26320171e47c774a228dc6e3d078fa20024155f5d2144fe1 SHA512 7a36fbfeed89c7fc0605304eb24c5d2ad88663a94287d80ff3777047c711041a802f7cb523fb23eaa176cfb1e8edc57d0e5484fea831a4d1c3cb88717e20a490 WHIRLPOOL e65de613346e54cd98aefafe1dbefd91cc91cf9c793dd06e9a7c9a8d142be57ada7d2548bf0c817c4fe39c24300e15f9098a6fa80d810f88835ffc9e37da7812
 DIST calculate-lib-3.5.2.3.tar.bz2 181986 SHA256 ebdc0aef209c39bec275f6c2255cdd8dadd4d02753d6767ce2af701c6f7c5703 SHA512 4cd460e420f6c14b41e9f489a6e146accf7bc1743b06c8d1a2f9f78f2c7bcf91304c7fa5a92239e7b68343606384312bfd84d364528190bf78cf6904682fe8cf WHIRLPOOL 02e4b511b114f5b816b6b2f67c00964421eb6d18e07638067812a0b086e8565e13edc7fb856abb4ce78d9f6da99ceca0bb79061ee07df827221b5e73e0053710
 DIST calculate-lib-3.5.2.4.tar.bz2 181930 SHA256 6c3774ab5dc6e46b301c24d58c0b5cb3afbef97630cd5d879d7aed8e1dd4817d SHA512 07ab453ac85311cebeef09a23083cb9b6e08d33390f841ec80d24fc9af08ae56ebe95e801038ec7128193a8ab2f1408856339259c5052262e383d627608ef2fb WHIRLPOOL a197154bef46907721d2e07a1691b311697f8ff127404e84a9abba6937b296e515a6b4d0961219a86dced9343a37b79a53e8ff4056e66e0681a9c7a7810d152e
+DIST calculate-lib-3.5.2.6.tar.bz2 181921 SHA256 7b06ab53e7017fd983850ded45b23df1d743f0a484c731aa123155861db5f8c7 SHA512 7a4bddcd813feb86ab50da17c97760ca56399294bb51ffd222ba32b2c9032f5e7cbe4e41dc24ac6da47236d5e4056b63e309a5ce7397a89698c061e9d63acb43 WHIRLPOOL 2bb61b1de2f68f04f430f00b6c4868edecbcd1cce67ab9f3c7d6bd57f8414ea8f31b13c23d414925408ccb70e555fd4583c14898bbc1089781352647077bbc2e
 DIST calculate-server-3.5.0.tar.bz2 6620 SHA256 f0e4806f4808b696d57756dd226ce3ff099e77cd9b6ae1a455adff0d5f3002f6 SHA512 c497c47a9224b6198edf278aa42ba0870f7fd24dee4d025d72e182204c85cecd9090eb4a875360589a52e8d687075ca9ad29c498680b8e7e6fce899c2773e6e9 WHIRLPOOL c757a0bf0d72f811a0fc60dabc9d432092b71a459dfa025e374eb89d3489fd4804a64f6d103c75c47347920d8fb8bddc21e1e15eea5162c0474708ff53e82b8f
 DIST calculate-server-3.5.1.tar.bz2 6638 SHA256 0e9fec83db9f3c68cfdb757f787c2bea100139dd2682ce89b4b88f91e839c1bc SHA512 ae4a93d3b3b82e415613a00c3551150520e0802d97397d4ab801f53c93da4743b8a270931280419daf5b16c620f39569ed531f829adfa964d73bf917577e1894 WHIRLPOOL 444afff370f1dc25b6b15cd6450ceac2cc0019c49c3c8b729394d35ddb1f19bc1c206f2b7848e242e877cdaa0bb614bfafbd75060c5f1a3baab2d46fe4e3ce8d
 DIST calculate-server-3.5.2.tar.bz2 6680 SHA256 e067ed915ae8ef2f8fd54fcaab63e666c25a90857ae70ded61c448d2e72a1a81 SHA512 8d45858f7bb9dfd8f9a251f66208f48e0abb8c65675184fadcc822f0a491f19ae848543a3149b48dd76efef4451fd8584ce722a56e42373690532e06bca05fbe WHIRLPOOL f8c061e72b3403c70fe951734ef3333fbfcfbfc2a019872cd4d2097fc3a718dd144c41903afb052ba53302ca38b8e0bff65472d31c0e6ee71e53ac9765a0278a
--- a/sys-apps/calculate-utils/calculate-utils-3.5.2.6.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.5.2.6.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+declare -A CALCULATE_MODULES=(
+	["lib"]="3.5.2.6"
+	["install"]="3.5.2.1"
+	["i18n"]="3.5.2.1"
+	["client"]="3.5.2.1"
+)
+
+inherit calculate-utils-r1
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+
				`@ -0,0 +1 @@`
				`# Calculate ini(theme.splash-verbose-background)==\|\|exists(#-ini(theme.splash-verbose-background)-#)== append=remove name=fbcondecor`
				`@ -0,0 +1 @@`
				`# Calculate exists(#-ini(theme.splash-silent-background)-#)!=\|\|exists(#-ini(theme.splash-verbose-background)-#)!=`
				`@ -1,2 +0,0 @@`
				`# Calculate mergepkg()>=15 path=/usr/share name=wallpapers`