From 79d61eb79db1d8805120bcc37041660fd4a0bf3a Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 24 Oct 2014 16:09:49 +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=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BE=D0=B5=D0=B2=20=D0=B4=D0=BB=D1=8F=20xfce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- media-gfx/calculate-wallpapers/Manifest | 2 +- .../media-gfx/calculate-wallpapers/.calculate_directory | 2 +- .../media-gfx/calculate-wallpapers/calculate.xml | 1 + .../media-gfx/calculate-wallpapers/xfce/.calculate_directory | 1 + .../media-gfx/calculate-wallpapers/xfce/Calculate Linux | 1 + .../media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue | 1 + .../calculate-wallpapers/xfce/Calculate Linux 11 Brown | 1 + .../media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue | 1 + .../calculate-wallpapers/xfce/Calculate Linux 12 Brown | 1 + .../media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue | 1 + .../calculate-wallpapers/xfce/Calculate Linux 13 Brown | 1 + .../calculate-wallpapers/xfce/Calculate Linux 13 Green | 1 + .../calculate-wallpapers/xfce/Calculate Linux 13 Magenta | 1 + .../3.1/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg | 1 + 14 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green create mode 100644 profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta create mode 100644 profiles/templates/3.1/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg diff --git a/media-gfx/calculate-wallpapers/Manifest b/media-gfx/calculate-wallpapers/Manifest index 0e9def6ae..6fcf9c160 100644 --- a/media-gfx/calculate-wallpapers/Manifest +++ b/media-gfx/calculate-wallpapers/Manifest @@ -1,4 +1,4 @@ -DIST wallpapers-11.tar.bz2 4419823 SHA256 a7e7e2379fd9c75531d5465adbc0c3e81542749aed1acc60fb935dfa5810368e SHA512 28320947976efc00c25774496dc2f1a308dc969bc4873828cfc261f46c5739f363a1dc4e55ff4f06104086a6404190341b7c9931df35c7f4629acfed1a0fadb1 WHIRLPOOL 87239ec088577a110b7546a74420cd480f8d06bc2adcfeba2fa121f8021ae829102cca5736c84d088f43005f5a5013c0b2e85dde58af316dc2442fb2a289ae3a +DIST wallpapers-11.tar.bz2 5318262 SHA256 9f33f5d4bf4aedfd10cc024c54d324f3bcbd9e633c95be7f166bd0e10e5ede35 SHA512 32e0573427357d1c372df3a68f77bd6d6faab16c9f5fc67b6cf21486683644de5a2878e8f1fb5826e3b67acc262c21b46d07f942341090e776e4bfcece37378a WHIRLPOOL ad61f7954323d436c3fae199aa64c477acfcfbb6fae23a939c18e5e50c7150c0b4cf64951ce1d60292f05b8a8a0d7b745a15eddbc6a41bc171c844509eaa215e DIST wallpapers-12.tar.bz2 14993163 SHA256 864e16a96960d65cccd7363390138af54e19106bfc700fe1d6913562d7b18b4b SHA512 b35b712e1993f960bdbfd0343b03d21bd990c38e9053920ac395443d010b4eb9f6178cfde0a3ca45a83c67a9b6609ffce9905dec4be400b521d82255533d60ec WHIRLPOOL 89ac4ee7edb961aebe62142badf6804eb0d7e381945360638c745c10b34e87e49d2aa6d3c1b73454b564a39eff9b387aabd9079b1f1c2dcd2b3a6549a866b466 DIST wallpapers-13.tar.bz2 14606610 SHA256 6838b0e70c50201b36e600a27a68af0b5b142b585299e27412836f72e5d36862 SHA512 9b83d30a428b2897708acda943cdf3de7e400a4fa1f4bdd6eea827fc6be37c0b1e8fdddf9acc9f3dea493071006bd2e4663c569562c546a56dddc60be2acc12b WHIRLPOOL da01fbcfef13e7d6f413903a3ff7011901ec782eab446e93ae20108e387faa7d472b4cf6650f78066640b8086a585aec876f012674e20b92ffd2ec3e683c34f4 DIST wallpapers-14-r1.tar.bz2 6632861 SHA256 44758e60504fe7f917da601c7d4d4a06de03fee19e86913b3c002b68eac150f8 SHA512 04660bb6f05156ead4b2353f60ad11b886fa9048eaa0b7240dd8ba845591e00b1a57792429397e916ca7761f05ee1919945bd5bc4c53d253b7b0eb827b3997bd WHIRLPOOL 968d64e510fb9e0a6b93530dce3c65d2eea480a0c5433424d40ae48b89649f1ef61ee988b73ffdd9e1060ec129444ba87ebe827c051e39574f005aab53ed7421 diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/.calculate_directory index 9629616dc..96e18fdf3 100644 --- a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/.calculate_directory +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/.calculate_directory @@ -1 +1 @@ -# Calculate merge()!=&&pkg()!=&&pkg(x11-themes/gnome-backgrounds)!= path=/usr/share name=gnome-background-properties +# Calculate merge()!=&&pkg()!= append=skip diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/calculate.xml b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/calculate.xml index 934caed9e..1958fd388 100644 --- a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/calculate.xml +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/calculate.xml @@ -1,3 +1,4 @@ +# Calculate pkg(x11-themes/gnome-backgrounds)!= path=/usr/share/gnome-background-properties diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory new file mode 100644 index 000000000..6f7fe0cf4 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/.calculate_directory @@ -0,0 +1 @@ +# Calculate path=/usr/share/backgrounds cl_ver>=3.2.2.1&&pkg(xfce-base/xfdesktop)!= diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux new file mode 100644 index 000000000..20a52fcab --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue new file mode 100644 index 000000000..3ed0d33cf --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Blue @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Blue/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown new file mode 100644 index 000000000..b6e7c349a --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 11 Brown @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_11_Brown/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue new file mode 100644 index 000000000..f38fe8a2c --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Blue @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Blue/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown new file mode 100644 index 000000000..d4a84a28e --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 12 Brown @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_12_Brown/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue new file mode 100644 index 000000000..e9540f83b --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Blue @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Blue/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown new file mode 100644 index 000000000..c57b7719f --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Brown @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Brown/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green new file mode 100644 index 000000000..66e74c523 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Green @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Green/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta new file mode 100644 index 000000000..9f671f63f --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/media-gfx/calculate-wallpapers/xfce/Calculate Linux 13 Magenta @@ -0,0 +1 @@ +# Calculate link=/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images/#-wallpaper(#-os_install_x11_resolution-#,/usr/share/wallpapers/Calculate_Linux_13_Magenta/contents/images)-# mirror diff --git a/profiles/templates/3.1/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg b/profiles/templates/3.1/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg new file mode 100644 index 000000000..f8ee42ae6 --- /dev/null +++ b/profiles/templates/3.1/2_ac_install_merge/xfce-base/xfdesktop/xfce-blue.jpg @@ -0,0 +1 @@ +# Calculate append=remove path=/usr/share/backgrounds/xfce