From 97cb9363a31bc45484ef70cadb76c5c6ec09ed2d Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Wed, 30 Apr 2014 18:05:52 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20plymouth=20=D0=B4=D0=BB=D1=8F=20=D1=8F=D0=B4=D1=80?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys-apps/openrc/.calculate_directory | 2 ++ .../3.1/2_ac_install_merge/sys-apps/openrc/rc.conf | 7 +++++++ .../templates/3.1/3_ac_install_live/.calculate_directory | 1 + .../3.1/3_ac_install_live/Depends/.calculate_directory | 1 + .../3_ac_install_live/Depends/plymouth-themes-calculate | 1 + .../3.1/3_ac_install_live/sys-boot/.calculate_directory | 1 + .../3_ac_install_live/sys-boot/grub/.calculate_directory | 2 ++ .../3.1/3_ac_install_live/sys-boot/grub/default.grub | 2 ++ .../3.1/3_ac_install_live/sys-boot/grub/default.grub.other | 2 ++ sys-kernel/calculate-sources/Manifest | 2 +- .../calculate-sources/calculate-sources-3.13.9.ebuild | 1 + 11 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/.calculate_directory create mode 100644 profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/rc.conf create mode 100644 profiles/templates/3.1/3_ac_install_live/.calculate_directory create mode 100644 profiles/templates/3.1/3_ac_install_live/Depends/.calculate_directory create mode 100644 profiles/templates/3.1/3_ac_install_live/Depends/plymouth-themes-calculate create mode 100644 profiles/templates/3.1/3_ac_install_live/sys-boot/.calculate_directory create mode 100644 profiles/templates/3.1/3_ac_install_live/sys-boot/grub/.calculate_directory create mode 100644 profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub create mode 100644 profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub.other diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/.calculate_directory new file mode 100644 index 0000000..deeb847 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate merge()!=&&pkg()!= name=etc + diff --git a/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/rc.conf b/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/rc.conf new file mode 100644 index 0000000..e3fa694 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/openrc/rc.conf @@ -0,0 +1,7 @@ +# Calculate format=openrc +#?pkg(sys-boot/plymouth)==# +rc_interactive="YES" +#pkg# +#?pkg(sys-boot/plymouth)!=# +rc_interactive="NO" +#pkg# diff --git a/profiles/templates/3.1/3_ac_install_live/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/.calculate_directory new file mode 100644 index 0000000..7223aa3 --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip env=install ac_install_live==on diff --git a/profiles/templates/3.1/3_ac_install_live/Depends/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/Depends/.calculate_directory new file mode 100644 index 0000000..dfccc15 --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/Depends/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip cl_merge_pkg!= diff --git a/profiles/templates/3.1/3_ac_install_live/Depends/plymouth-themes-calculate b/profiles/templates/3.1/3_ac_install_live/Depends/plymouth-themes-calculate new file mode 100644 index 0000000..783e65d --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/Depends/plymouth-themes-calculate @@ -0,0 +1 @@ +# Calculate append=skip merge(media-gfx/plymouth-themes-calculate)!= merge=sys-apps/openrc,sys-boot/grub diff --git a/profiles/templates/3.1/3_ac_install_live/sys-boot/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/sys-boot/.calculate_directory new file mode 100644 index 0000000..720d52e --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/sys-boot/.calculate_directory @@ -0,0 +1 @@ +# Calculate append=skip diff --git a/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/.calculate_directory new file mode 100644 index 0000000..6b21c39 --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/.calculate_directory @@ -0,0 +1,2 @@ +# Calculate merge()!=&&pkg(sys-boot/grub:2)!=&&pkg(media-gfx/plymouth-themes-calculate)!= path=/boot + diff --git a/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub new file mode 100644 index 0000000..f36a121 --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub @@ -0,0 +1,2 @@ +# Calculate format=openrc path=/etc/default name=grub os_install_x11_video_drv!=other +GRUB_CMDLINE_LINUX=" elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash udev quiet" diff --git a/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub.other b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub.other new file mode 100644 index 0000000..bf36c2b --- /dev/null +++ b/profiles/templates/3.1/3_ac_install_live/sys-boot/grub/default.grub.other @@ -0,0 +1,2 @@ +# Calculate format=openrc path=/etc/default name=grub os_install_x11_video_drv==other +GRUB_CMDLINE_LINUX=" #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# splash udev quiet" diff --git a/sys-kernel/calculate-sources/Manifest b/sys-kernel/calculate-sources/Manifest index e325318..2dd4924 100644 --- a/sys-kernel/calculate-sources/Manifest +++ b/sys-kernel/calculate-sources/Manifest @@ -1,4 +1,4 @@ DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a DIST patch-3.13.9.xz 249308 SHA256 c1131c776964ee7d276b99142f4bd2e6feedf2adc92b44e983c3dd930c6d0c3b SHA512 d39c7d20691fd7f9399470f485db3d860c44bcb06a80b7451dd10eede8de02c1de46cb418a1e3fe12a2175a1acc84dc2effc4c24e7e73f26d0723085ef4c513b WHIRLPOOL e1889cab033a981841811f2a052dd68abac995c901c809477404a45f6d1abf8a39da3d1f96dff9b088ace17c3b8009820d2ca331838226c0719d11b11c11c5b0 -EBUILD calculate-sources-3.13.9.ebuild 565 SHA256 8b7cfe1211cc47710f0fb06837c5116b1b16e60864f7afc7035866b1973816d3 SHA512 df9bdfdd4015e5efab658d120aa174d52045aca31893973e271e12dcce73894fb66736e42b63528d93f4d9605b2148497de14d61c4f5209df69d60ea3f2ba789 WHIRLPOOL 3d7ba36462239e4c03bbaf27d1d161aaaa1b6825223e3f8cca0443ff59b622619707b10eb0f7b400116bd6541e4826ad5e738c61627c62ddbb8793102c36c75a +EBUILD calculate-sources-3.13.9.ebuild 602 SHA256 11ba457a4abb22bbac4a02cad9b5d2c1a0e6cb611b5202f662e18a3ba0fc5d6b SHA512 e53f90f8130dc0bb36648f279a08a162da23314e82864590b4ddd4a68848195c70e83f077446783f61af6fc4d60b840ba5b52dfc58a7fee922bcf8fdccf7ab10 WHIRLPOOL e2fe043a63d36118ffbd572b0fda4f879edfa901fbb88c65e8d890c126c9dba36c66e38d77eec42070a565b72d02c5ef0b426b3a6dac6ff496d09634c89547a8 MISC metadata.xml 431 SHA256 60ee92125a82b86e9cb935d0ff9aba3237f080009f7b58d163b744727ea7d2b6 SHA512 d86c303ab69a9e2ffbba590beae887991a21d0b5eb18765b73e13db3323c365c6e19106a9192395bf54b3f416213aceb7eeb1150c445c406ce0fd4220db36826 WHIRLPOOL c420afc278707f2b7fabfb4bb9a1b84a32bd7dcdee30be68a1b534485e1efb90158edc7542c362149c386afcc34518c3222d6ebaa4a496aede0fc6f3310c2af7 diff --git a/sys-kernel/calculate-sources/calculate-sources-3.13.9.ebuild b/sys-kernel/calculate-sources/calculate-sources-3.13.9.ebuild index 4ad33f6..e288ec3 100644 --- a/sys-kernel/calculate-sources/calculate-sources-3.13.9.ebuild +++ b/sys-kernel/calculate-sources/calculate-sources-3.13.9.ebuild @@ -14,6 +14,7 @@ HOMEPAGE="http://www.calculate-linux.org" IUSE="" DEPEND="vmlinuz? ( || ( app-arch/xz-utils app-arch/lzma-utils ) + media-gfx/plymouth-themes-calculate sys-apps/v86d !