calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

Fix calculate-templates.

Browse Source
atratsevskiy
Mike Hiretsky 13 years ago
parent c8bdddfa8e
commit efa31f50c1
2 changed files with 1 additions and 127 deletions
Show Stats Download Patch File Download Diff File

2
sys-apps/calculate-templates/Manifest
Unescape View File

@ -1,7 +1,7 @@
AUX calculate-templates-2.2.15-ntfs_mount.patch 485 RMD160 49f1a2bd98da6779ec7746cb4d318d89e627d7b7 SHA1 7b369bfdcc509daa4caaab66a408c0663feab694 SHA256 fb0a29438c6652ac3a1d66cfb4c587bddd2bbc2dd5025a4113cca19b8ac2d79b
AUX calculate-templates-2.2.16-clean_dev.patch 395 RMD160 bed144222a7bc3a6c21628435b1d1b69f8b1bc3e SHA1 773823d4c09e6b28e54c08bc31671c24dba18fe0 SHA256 66de5c10ad83bd5f593d33dba4a8486af048eea5737ca4c1f16cae1b4bd03287
AUX calculate-templates-2.2.16-fix_variable_bug.patch 827 RMD160 0352e4877b12e60dc02c5bdf609d0ae4d9c320a5 SHA1 ee38fead790ba2be8c0cd860caecfac01448bda4 SHA256 5ed1e434e7809c3df1a6cc68a8b5f27aaa1d0cc77ca1f7decb2edfe07ee08aee
AUX calculate-templates-2.2.16-many_fix.patch 5757 RMD160 577ba12cf752466984722d73894aa890312c240d SHA1 4e0dd282a6c0a9878b767c5a964f41740d3e7334 SHA256 094ade697f420faaf36edc83dc3fc5755ab8476b0d8c50b0f01103d6dfc09d20
AUX calculate-templates-2.2.16-many_fix.patch 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
AUX calculate-templates-2.2.16-udev_runlevel.patch 664 RMD160 1bbdbcc1b85db4f7aa912f37793b79279db5e34c SHA1 4fbc223b674cae230cb5834adffaa15b09beee67 SHA256 f9f089808ce30e3716ed6836173af73ccee6a871e077721c3e3fea046dccada0
DIST calculate-templates-2.2.15.tar.bz2 231070 RMD160 df93588bb98c449447b276d124ebfc7062fcac7a SHA1 881f004803062de7b0d2704fbb9b81abb40f378f SHA256 6f252027a037111662ae89a9007405f8d474967a79015690fb85cebd749d6858
DIST calculate-templates-2.2.16.tar.bz2 231990 RMD160 ad50cc16875daae294ee2ddd674481a57e4ce874 SHA1 5d90afc0dceca2d80ca5cb20a3d18c04dfb60abd SHA256 bca54589f5fa75054d8d9572650411fa2fe4776869331fe7fe37d75f4b442c16

126
sys-apps/calculate-templates/files/calculate-templates-2.2.16-many_fix.patch
Unescape View File

@ -1,126 +0,0 @@
diff --git a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
index e323c6c..a69927b 100644
--- a/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
+++ b/desktop/desktop/20-kde-4.6/.kde4/share/config/ksplashrc
@@ -2,9 +2,9 @@
#тема загрузки рабочего стола
[KSplash]
Engine=KSplashX
-#?os_install_locale_lang!=pt_BR#
+#?os_locale_lang!=pt_BR#
Theme=CalculateSplash#-case(capitalize,os_locale_language)-#
-#os_install_locale_lang#
-#?os_install_locale_lang==pt_BR#
+#os_locale_lang#
+#?os_locale_lang==pt_BR#
Theme=CalculateSplashPt
-#os_install_locale_lang#
+#os_locale_lang#
diff --git a/install/1merge/glibc/locale.gen b/install/1merge/glibc/locale.gen
index cf85a94..15cff6b 100644
--- a/install/1merge/glibc/locale.gen
+++ b/install/1merge/glibc/locale.gen
@@ -26,7 +26,6 @@ nn_NO.UTF-8 UTF-8
pl_PL.UTF-8 UTF-8
#Portuguese
pt_PT.UTF-8 UTF-8
-pt_PT.UTF-8@euro UTF-8
#Russian
ru_RU.UTF-8 UTF-8
#Spanish
diff --git a/install/1merge/grub2/default.grub b/install/1merge/grub2/default.grub
index a3f5f9f..67ddb16 100644
--- a/install/1merge/grub2/default.grub
+++ b/install/1merge/grub2/default.grub
@@ -2,17 +2,27 @@
GRUB_DISABLE_RECOVERY=true
GRUB_DEFAULT=saved
GRUB_TIMEOUT=3
-GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 udev quiet doscsi"
-GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#"
+#?pkg(media-gfx/cld-themes)!=||pkg(media-gfx/cldx-themes)!=||pkg(media-gfx/cldg-themes)!=||pkg(media-gfx/cls-themes)!=||pkg(media-gfx/cds-themes)!=||pkg(media-gfx/cmc-themes)!=#
+GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
+#pkg#
+#?pkg(media-gfx/cld-themes)==&&pkg(media-gfx/cldx-themes)==&&pkg(media-gfx/cldg-themes)==&&pkg(media-gfx/cls-themes)==&&pkg(media-gfx/cds-themes)==&&pkg(media-gfx/cmc-themes)==#
+GRUB_CMDLINE_LINUX="video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=off,theme:tty1 #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 udev quiet"
+#pkg#
GRUB_TERMINAL="gfxterm"
GRUB_GFXMODE="auto"
GRUB_BACKGROUND="/boot/grub/grub-calculate.png"
GRUB_COLOR_NORMAL="white/black"
GRUB_COLOR_HIGHLIGHT="magenta/black"
GRUB_VIDEO_BACKEND="vbe"
-#?os_install_linux_subname==#
+#?os_install_linux_subname==&&os_install_scratch==off#
GRUB_DISTRIBUTOR="#-os_install_linux_name-#"
#os_install_linux_subname#
-#?os_install_linux_subname!=#
+#?os_install_linux_subname!=&&os_install_scratch==off#
GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-#"
#os_install_linux_subname#
+#?os_install_linux_subname==&&os_install_scratch==on#
+GRUB_DISTRIBUTOR="#-os_install_linux_name-# Builder"
+#os_install_linux_subname#
+#?os_install_linux_subname!=&&os_install_scratch==on#
+GRUB_DISTRIBUTOR="#-os_install_linux_name-# #-os_install_linux_subname-# Builder"
+#os_install_linux_subname#
diff --git a/install/1merge/openrc/boot.runlevels/.calculate_directory b/install/1merge/openrc/boot.runlevels/.calculate_directory
new file mode 100644
index 0000000..e5f23f4
--- /dev/null
+++ b/install/1merge/openrc/boot.runlevels/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels name=boot
+
diff --git a/install/1merge/openrc/boot.runlevels/consolefont b/install/1merge/openrc/boot.runlevels/consolefont
new file mode 100644
index 0000000..fb62863
--- /dev/null
+++ b/install/1merge/openrc/boot.runlevels/consolefont
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/consolefont symbolic
diff --git a/install/1merge/openrc/default.runlevels/.calculate_directory b/install/1merge/openrc/default.runlevels/.calculate_directory
new file mode 100644
index 0000000..7e25c99
--- /dev/null
+++ b/install/1merge/openrc/default.runlevels/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels name=default cl_chroot_status==off
+
diff --git a/install/1merge/openrc/default.runlevels/numlock b/install/1merge/openrc/default.runlevels/numlock
new file mode 100644
index 0000000..0bc43c1
--- /dev/null
+++ b/install/1merge/openrc/default.runlevels/numlock
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/numlock symbolic hr_laptop!=
diff --git a/install/1merge/openrc/defaultrunlevel/.calculate_directory b/install/1merge/openrc/defaultrunlevel/.calculate_directory
deleted file mode 100644
index 7e25c99..0000000
--- a/install/1merge/openrc/defaultrunlevel/.calculate_directory
+++ /dev/null
@@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels name=default cl_chroot_status==off
-
diff --git a/install/1merge/openrc/defaultrunlevel/wicd b/install/1merge/openrc/defaultrunlevel/wicd
deleted file mode 100644
index 0bc43c1..0000000
--- a/install/1merge/openrc/defaultrunlevel/wicd
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate link=/etc/init.d/numlock symbolic hr_laptop!=
diff --git a/install/1merge/udev/sysinit/.calculate_directory b/install/1merge/udev/sysinit/.calculate_directory
new file mode 100644
index 0000000..0f7257b
--- /dev/null
+++ b/install/1merge/udev/sysinit/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels
+
diff --git a/install/1merge/udev/sysinit/udev b/install/1merge/udev/sysinit/udev
new file mode 100644
index 0000000..568c5de
--- /dev/null
+++ b/install/1merge/udev/sysinit/udev
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/udev symbolic
Write Preview
Loading…
Cancel
Save