From 288fb1366da4bf35229b983cbed725d2b8478058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 25 Dec 2015 10:59:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82,=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.3/6_ac_update_sync/remerge/00-ini | 2 +- .../3.3/6_ac_update_sync/remerge/{87 => 92} | 4 +-- sys-apps/calculate-utils/Manifest | 1 + .../calculate-utils-3.4.5.12.ebuild | 26 +++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) rename profiles/templates/3.3/6_ac_update_sync/remerge/{87 => 92} (51%) create mode 100644 sys-apps/calculate-utils/calculate-utils-3.4.5.12.ebuild diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini index ca120fd7c..f5cc3881c 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/00-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 90 +remerge = 92 diff --git a/profiles/templates/3.3/6_ac_update_sync/remerge/87 b/profiles/templates/3.3/6_ac_update_sync/remerge/92 similarity index 51% rename from profiles/templates/3.3/6_ac_update_sync/remerge/87 rename to profiles/templates/3.3/6_ac_update_sync/remerge/92 index b670d8344..7151ac578 100644 --- a/profiles/templates/3.3/6_ac_update_sync/remerge/87 +++ b/profiles/templates/3.3/6_ac_update_sync/remerge/92 @@ -1,4 +1,4 @@ -# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/baselayout ini(overlay-calculate.remerge)<87 +# Calculate format=samba path=/etc/calculate name=ini.env merge=sys-apps/baselayout,sys-boot/grub ini(overlay-calculate.remerge)<92 [overlay-calculate] -remerge = 87 +remerge = 92 diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest index c6106a3f5..14e720dec 100644 --- a/sys-apps/calculate-utils/Manifest +++ b/sys-apps/calculate-utils/Manifest @@ -41,6 +41,7 @@ DIST calculate-install-3.4.4.4.tar.bz2 75301 SHA256 1b8f3ba4fa2ef448da7ffe2cd098 DIST calculate-install-3.4.5.2.tar.bz2 75359 SHA256 5dd2faa94b3925c4b4fbc8e4c69f895dcc54d01ccb5d8b3ccc44c6c05c2033af SHA512 ba79bffc889bd5d7fc25e6b2f3a01164a0797701922a5f64dac109eb23b8b60d3acd1fdcdcb92253252bc2c3b1e2df5206955f91ba5c0ee582d1e53911c42301 WHIRLPOOL 62f76589b7be5b05cf691d51ce02831f8472ee05b6f5a502d3fe40dcac92da6dae5b485b1af7c5db48bb515a31998e31cf5a20ddccd1bfd308ae60e484bf3ddf DIST calculate-install-3.4.5.3.tar.bz2 75775 SHA256 82394411b083f3193503350a9f0f29221636e5921b81a5efd54338724ef0f57d SHA512 540ff467085e32ea5a3d8caebe81fa3df6fc73f4b9dec445b073e8d3f80c00ce0fab843b4cc45f90c62ff1fd8f5b1ae2c47ce0e7e70ebd6563476f8c615abd99 WHIRLPOOL b304d6153ae99ab3c5796c036cade1815151e6e033b685c121afd3bd32d1ac06bade549a2736db16d282400d94e98dd0a58c734af67823b19c64fdf7c0acdec0 DIST calculate-install-3.4.5.4.tar.bz2 75741 SHA256 0bddf926f8ceba5c38005c8bb2aa5600489e579a6ae6dfb86b44d1a5f2e34fff SHA512 de84b1150261e876b044d990e40e63ba0ad3444a34f10f5cef74587861f82f9cf2887686d664f5fa3708900aca08af1f6e94ca247ae2d229e8ac1ded35e55fb0 WHIRLPOOL b2e59a9a67fc9c50d5d02d2f0d303f552b10af7dee55a0242f0417722fc3eefb0564c58623a9f412d8283d5432ae474165fcc93598a25b84bd79e81ded25b305 +DIST calculate-install-3.4.5.5.tar.bz2 75737 SHA256 5fc84ad0b4318ef5191b0c719e4921545a750abdbadf78a77a52281087980e15 SHA512 4dd270a6736fcd1a351ba0d85bc0364856f71cc535fc8aa10a6e94a785f13e728a14c1634ed591610cd9ff5fcea4a90f1e3490396c0ba99eb5498781a2460531 WHIRLPOOL 2f5e7df3c2a6714486d947c0dadb65da8647c08d6d85fdcd047e04a2c2fded9a60f38f826728839bc3a4928693f10ef926bb6fab0b766357196183dc621da8c2 DIST calculate-install-3.4.5.tar.bz2 75605 SHA256 f5033314a63428b3ef32743426a5f6bb345d72c15f9d74a69cc61c8b9a4365dc SHA512 d8fcc8922eda6b7edfd330aec506b52ff9d7d5452cb478c6e57fa8f478b0b53417cf7e1ab06ef8d465ebae07ce832f88cd38012bc06ed2c99eb7308848054182 WHIRLPOOL 3ec9f91a0424652d4242869cedb39cef186c959c6cfb23aca4645290765ca38ffd762c8c38cfca3019a9e87431bc10729149c0ff78183981c929c5ea5271ba83 DIST calculate-lib-3.4.2.tar.bz2 159693 SHA256 0f93617fabce30c0e673e6363ecb52fc0e0393556814e81a7106abaed7a358fa SHA512 89d42b0379ff18ba93d80125da8ef4eff36de9ec6ae021649987fa7e525ee66002c82a0b6bfb400622608f70a13eb8c006b16bcf4e78ca3065862f1ea7716262 WHIRLPOOL 6f245954c2b40197ea6a31b436c305f7fb562fd9365cc50361febb850315aa6d3d1b483618ee5dee26b3d835b5be4e09b6db29b2e2db8b73a5bdd69a894c934e DIST calculate-lib-3.4.4.7.tar.bz2 161997 SHA256 475e928d4f77c784d8b302e614d06f8c5f8bd0f95a0170e744c68d22e47b9762 SHA512 6fcd34d13c82b76e381897b5a12885ea61e3978b50e680b587d375408de3b66a5c6995fe7273f04f25ef094acb447ccbefb790f4a14ca5fd33f65646b72f15b1 WHIRLPOOL 04c974b7234b6a83520016d62cdcf22e7b7d734f95bcfffa1c458145420153f3f732a12d0c8c2db4bcf08745bc93963c70402b4571f84f1266caaf7e31890421 diff --git a/sys-apps/calculate-utils/calculate-utils-3.4.5.12.ebuild b/sys-apps/calculate-utils/calculate-utils-3.4.5.12.ebuild new file mode 100644 index 000000000..0896622d4 --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.4.5.12.ebuild @@ -0,0 +1,26 @@ +# 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.4.5.6" + ["install"]="3.4.5.5" + ["core"]="3.4.5.1" + ["i18n"]="3.4.5.6" + ["client"]="3.4.5.1" + ["update"]="3.4.5.7" + ["builder"]="3.4.5.8" +) + +inherit calculate-utils + +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" +