Merge branch 'develop' of git.calculate-linux.org:/repo/calculate into develop

6 years ago · 5c675636cb
parent 66af674b05 b33011b338
commit 5c675636cb
9 changed files with 54 additions and 12 deletions
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/custom.set
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/custom.set
@ -1,6 +1,6 @@
 # Calculate path=/etc/portage/sets name=custom.#-case(lower,os_install_linux_shortname)-# exists(/etc/portage/sets/custom.#-case(lower,os_install_linux_shortname)-#)== protected 
 #?os_install_locale_lang==ru_RU#
-# этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
 #!os_install_locale_lang#
-# this file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new #-os_install_linux_shortname-# installation
 #os_install_locale_lang#
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.keywords
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.keywords
@ -1,6 +1,6 @@
 # Calculate path=/etc/portage/package.keywords name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.keywords/custom.#-case(lower,os_install_linux_shortname)-#)==
 #?os_install_locale_lang==ru_RU#
-# этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
 #!os_install_locale_lang#
-# this file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new #-os_install_linux_shortname-# installation
 #os_install_locale_lang#
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.mask
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.mask
@ -1,6 +1,6 @@
 # Calculate path=/etc/portage/package.mask name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.mask/custom.#-case(lower,os_install_linux_shortname)-#)==
 #?os_install_locale_lang==ru_RU#
-# этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
 #!os_install_locale_lang#
-# this file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new #-os_install_linux_shortname-# installation
 #os_install_locale_lang#
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.unmask
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.unmask
@ -1,6 +1,6 @@
 # Calculate path=/etc/portage/package.unmask name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.unmask/custom.#-case(lower,os_install_linux_shortname)-#)==
 #?os_install_locale_lang==ru_RU#
-# этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
 #!os_install_locale_lang#
-# this file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new #-os_install_linux_shortname-# installation
 #os_install_locale_lang#
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/portage/package.use
@ -1,6 +1,6 @@
 # Calculate path=/etc/portage/package.use name=custom.#-case(lower,os_install_linux_shortname)-# protected exists(/etc/portage/package.use/custom.#-case(lower,os_install_linux_shortname)-#)==
 #?os_install_locale_lang==ru_RU#
-# этот файл будет перенесён при установке #-os_install_linux_shortname-#
+# Этот файл будет перенесён при установке #-os_install_linux_shortname-#
 #!os_install_locale_lang#
-# this file will be migrate to new #-os_install_linux_shortname-# installation
+# This file will be migrate to new #-os_install_linux_shortname-# installation
 #os_install_locale_lang#
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-qt-0.13.0/default/desktop-items-0.conf
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/x11-misc/pcmanfm-qt-0.13.0/default/desktop-items-0.conf
@ -14,7 +14,7 @@ pos=@Point(100 100)

 #?os_root_type==livecd#
 [calculate-community.desktop]
-pos=@Point(100 200)
+pos=@Point(200 300)

 [gparted.desktop]
 pos=@Point(200 200)
@ -23,5 +23,5 @@ pos=@Point(200 200)
 pos=@Point(100 300)

 [calculate-install.desktop]
-pos=@Point(200 300)
+pos=@Point(100 200)
 #os_root_type#
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/xfce-base/XFCE-4.10/.config/xfce4/desktop/icons.screen0.rc
@ -20,7 +20,18 @@ col=1
 row=2
 col=0

+#?os_locale_language!=ru&&os_locale_language!=bg&&os_locale_language!=uk#
 [Calculate Linux Community]
+#os_locale_language#
+#?os_locale_language==bg#
+[Calculate Linux Общност]
+#os_locale_language#
+#?os_locale_language==ru#
+[Сообщество Calculate Linux]
+#os_locale_language#
+#?os_locale_language==uk#
+[Cпівтовариство Calculate Linux]
+#os_locale_language#
 row=2
 col=1

--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@ -1,4 +1,5 @@
 DIST calculate-builder-3.6.2.2.tar.bz2 42192 BLAKE2B 16657aeb8c821011730d8e09d98f9982102f8b85a12bda24bb85ba9e7126646b1c01727bc72172039291c49775b2e9cdbba8ded7137a7f69852e20d795f03d7a SHA512 c085e717ed15ee4b504fae5aaac9712317e5821a324c497fa3c1a959edef0a87be1129a410772c397aeee376c04a09f494094bf6b193ecc0f1b9aad4d7c5184f
+DIST calculate-builder-3.6.3.1.tar.bz2 42095 BLAKE2B 8e6de079dda5e177b957373187d89f5afb4ef5c6e5746e00afa05efa688b9339aa28e76d57ef6f2ee95154221d6ad0212456377237b3865e6a5dd0ca7d248da8 SHA512 a6262dbc47cd642e47b85012a6404fe74f96cefc46ec6075c2555cce5ccf468547d9790902da858ec9dedb327265c9178a8fa820f172c786ba75d3e090897e26
 DIST calculate-builder-3.6.3.tar.bz2 42003 BLAKE2B 7eedbd00758bf6ab12077ae9755df4e0f9c43d8f13d99be6b9c7c04d8bfe09ff7a960fad1ae29d87bcd7ebaf541bab49cb1f3f7aa00d6ae76a6df38931c2268b SHA512 382f75cf72967f9b7cf7f9fed5246f7486d7d86a0238f3ea20092a02dcd94abfb16aca1200b55146903a02d4239d2587b1757bc3ab2689580aa54cd7e07b1d37
 DIST calculate-client-3.6.2.1.tar.bz2 31615 BLAKE2B ab693696ce2d7b43777c5f0d950e2aae6d94d145cfc678a08429a0a7948251403f918981f0accc572c94e46cba789ccc1ed7be7fca91604f87916f3118ffc9fe SHA512 2c148dea83ccaeec731e9dc1a3f0a5a02668f70f2fb16596671e0c0b032c1bf2f5a54a2a2657f35c7b52f1d7eadb77787701feb11404f59164251aed80159bc9
 DIST calculate-client-3.6.3.tar.bz2 31616 BLAKE2B 83602a115d4761c4d0515da39286e1057ce28487196adfc9c745a8d4040438ad1a3aa3be0bf8e165b2e62177d97360cbb70a5660b9c1cf49858a727020e4e0f2 SHA512 4d4a78f726bea362f530ea7972b9af3a6cfc4d883826c2a6497f47a46585653163694db72f755182005900099b6f3489f0a2879c79fc3b2de08171fbc9d1e37d
@ -23,4 +24,5 @@ DIST calculate-server-3.6.3.tar.bz2 6683 BLAKE2B e979f47137316d0bafd7aa8a6ddd1a6
 DIST calculate-unix-3.6.2.tar.bz2 21651 BLAKE2B 61eceebfd899fc3cbab7df324e1227dde15d3413433881a82331c497ca87d20a869a5de80970c08592c1a12fc9d9cc860ddae93660b3e0079f04d77719389416 SHA512 fa7dc5c5ba48b7ab7ef3cd06f0bd1567c9c72ef7c8ecf07297eb68199c297e9a0cb97c2587225976b6cd91f86c41641801dfb5e7c8b4cd7c66b58c33e567c0bb
 DIST calculate-unix-3.6.3.tar.bz2 21671 BLAKE2B 88af91d2ba7969a34f4794b5a79a909758f76cffe3eaf1c29c079623312d60d3a9ed6dfcb92e36f6a9abe72c2d7e81d5681baee1b546be84a19c7702791e07ab SHA512 d182cc0a68b664361c660ec36a9b9273e8430d9833fe5d5a88363256f2f64d33bcff46b3004d1badd23663d46b6c2c9116c5ea4e40871b15419181dbc1733739
 DIST calculate-update-3.6.2.tar.bz2 37216 BLAKE2B 3fc7a125d4e580eb3c9f8fa310468043ff5242696d1a5a71a6fc0a998289fc4eb530815c9d38ee3140392bea726a077f56cc97046843d764815e006acfea0f9e SHA512 ece72a4379c1b59abde99c820a82d77022f6b789b3a4f57f3a0d324c0f7b96de53ccd82b991f58a625b688586ce0625da21bf33572074085db3a67593d7b6d20
+DIST calculate-update-3.6.3.1.tar.bz2 37533 BLAKE2B 204dd845f5467bee7bc355659a69782733d4876ddee5fef02c1066b249c616f994d6fa18924b42ba53c530059f525f983c827fb9f669cc0dc84116af657be9a9 SHA512 30c5f9e6678be9cbae47baf1386f0512efaca0d981e0de896507f7214f973b7a8b07625fbca8398cd673d8e288ad5483e0efa7e7ab844065b54d409205929312
 DIST calculate-update-3.6.3.tar.bz2 37223 BLAKE2B 6c165c7adb0672249eea75a54fbc4d6d909640c057ea44b936e45c95292c364f505798e92c511de2932d9ecce3b034ea3a1aa0a7ec98e2541c8819b9e931bfa4 SHA512 ba9e394d21e2b12d2128e8ebca553a515778ef6937602e28f7db34538884b107823842ad215b8df2184879f78d3f48f2decd14f52012d802f1eb3848b1a9107f
--- a/sys-apps/calculate-utils/calculate-utils-3.6.3.1.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.3.1.ebuild
@ -0,0 +1,29 @@
+# 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=(
+	["update"]="3.6.3.1"
+	["builder"]="3.6.3.1"
+)
+
+inherit calculate-utils-r4
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+IUSE="+gpg"
+
+RDEPEND="
+	gpg? (
+		app-crypt/gnupg
+		app-crypt/openpgp-keys-calculate-release
+	)
+"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="x86 amd64"
+