Merge branch 'develop' of git.calculate.ru:calculate/overlay into develop

13 years ago · e747958d68
parent eb677c780d b1576ab5b2
commit e747958d68
7 changed files with 88 additions and 6 deletions
--- a/profiles/templates/install/1system/calculate-install/boot/.calculate_directory
+++ b/profiles/templates/install/1system/calculate-install/boot/.calculate_directory
@ -1 +1 @@
-# Calculate path=/
+# Calculate path=/ cl_ver<3.0
--- a/profiles/templates/install/1system/grub/.calculate_directory
+++ b/profiles/templates/install/1system/grub/.calculate_directory
@ -1,2 +1,2 @@
-# Calculate belong()!=&&pkg(sys-boot/grub)!= path=/boot
+# Calculate belong()!=&&pkg(sys-boot/grub)!= path=/boot cl_ver<3.0

--- a/sys-apps/calculate-assemble/Manifest
+++ b/sys-apps/calculate-assemble/Manifest
@ -12,7 +12,7 @@ AUX calculate-assemble-2.2.26-r2.patch 2185 RMD160 488384cc8f02cbc6a52d528e48c8d
 AUX calculate-assemble-2.2.27-fix_branch_rename.patch 1850 RMD160 45296e0f798000fe5703e12ea40a43ffe9afa96d SHA1 2357d7777db7294831f0b60b6c643dec73c0b7fd SHA256 5316f1775d0f2fea26cd95c9ff6f705280d70f35bfb8e38f00f8b65e26694066
 AUX calculate-assemble-2.2.27-r1.patch 1940 RMD160 c1c0c79e7f9d4f2e07450d81cf736cc93c3056c7 SHA1 125d2f526db35d79e5c6118de9f80ba97973816f SHA256 d8ae052111ee0e55c1900db13a289c3602523912d2a1e6dc35f51ae9ee1aca13
 AUX calculate-assemble-2.2.27-r2.patch 3205 RMD160 b67eaf093a6a5a08014bf606ca732f625b52af84 SHA1 9a26772718a2cbc1c6b9c6c105d86be46b7b9fc3 SHA256 21b8bba5978de35fcab779b2578f45fc44037578f9dc387762c5e8db3d478272
-AUX calculate-assemble-2.2.28-downgrade_check.patch 842 RMD160 ed31148e42a8ca24d53dedb8277c3a6fbeab56a9 SHA1 9d99a09ff69609faa77cab205db05fd8d7244831 SHA256 df6e66f792c02b920bc8c8860ed53bc03c735ef4c0ab3cc13c428262f72a80d1
+AUX calculate-assemble-2.2.28-downgrade_check.patch 1384 RMD160 ef3a6cd9e0b01131cd2be1677f131adb717a949f SHA1 b06f227dbe56fc193617b1e1bf2f686bd9f3b199 SHA256 a6c018a83cb2ece8e85b494c9939a9bb16b2f2ece917bed3936ffefa22384790
 AUX calculate-assemble-2.2.28-python_updater.patch 1007 RMD160 2af36b804109f1ed0bedc1c7fc1e3cc1472309af SHA1 06185ffe506c58ae21b5cff41035acc3d0d77b2a SHA256 aca1c137e6a01de48dd4341cf66d588f34efc849d0fcd957bac9de9223a47534
 DIST calculate-assemble-2.2.24.tar.bz2 25474 RMD160 23e96efd45458af4529bec3e99bda53dccbdefb2 SHA1 04d143480458094f86e44c12d37b9f2fe77de769 SHA256 d0bf55d2132c083447a4014a8466ce2ed10b72ed23072481d66bebd696f928ad
 DIST calculate-assemble-2.2.25.tar.bz2 25488 RMD160 66890bf3a369073954ac54ea1683a9bb4a6bdd1e SHA1 1865513524d743262ce4573eefb8224bf1f95034 SHA256 0ff115cf922cca6c5c199aaff32580c0094e1aabbb05bdab4d49efbcc80ee4d6
@ -38,6 +38,7 @@ EBUILD calculate-assemble-2.2.27-r3.ebuild 719 RMD160 854237b84e015b181b6c4619ca
 EBUILD calculate-assemble-2.2.27.ebuild 481 RMD160 bfb1ea17926433096a873659fc1c4aa1f75b9daf SHA1 93bd0284644e350f08b3437e7366cd7cc11409ab SHA256 227ed862db221531bb0669fe9ca115b61f90633a1a6b01f06afa98d161274769
 EBUILD calculate-assemble-2.2.28-r1.ebuild 627 RMD160 33dcdaa8d393ef94f1c942dad149d40c43e5c8d2 SHA1 ea0eb331508598f9a30ed2fca4d919f5cecfec67 SHA256 5a87e8732fb91d81612317cff5c1ad43443a1dd6d949c4d90440068d0e932c65
 EBUILD calculate-assemble-2.2.28-r2.ebuild 724 RMD160 ef62fbb8920717092d65ca95bc19256717b01bc1 SHA1 88f77b096ebce696b9d839469d4af3525cc4270a SHA256 3ad1a48830d1e7d8438014024504f68bf4dbdea0c65537db443af62b89af3ab9
+EBUILD calculate-assemble-2.2.28-r3.ebuild 724 RMD160 ef62fbb8920717092d65ca95bc19256717b01bc1 SHA1 88f77b096ebce696b9d839469d4af3525cc4270a SHA256 3ad1a48830d1e7d8438014024504f68bf4dbdea0c65537db443af62b89af3ab9
 EBUILD calculate-assemble-2.2.28.ebuild 481 RMD160 30101e2f816195dbce6126b4f7b3ee2bb3d0f17e SHA1 50510fa58b7b591012be10bba451b3d5ba6bccfe SHA256 c3ef039e580afa8211e0364e43b8e85af466631b49c93c5bd165d35896d96643
 EBUILD calculate-assemble-2.2.9999.ebuild 498 RMD160 2c78ad8ec93daa2714f37760bf62f1071160ba4b SHA1 31812083d2ac1e171b95e02519888690a747a706 SHA256 0371109c66629a5895716c2e5c867a3bb15437d9bbec95b9c5fe387de8bea62e
 MISC ChangeLog 16531 RMD160 80f48b2586d89deeb11f886bd04f748fb0ed7912 SHA1 272ed7e7e96bd24c0d887a98086de3c4aa13376f SHA256 1030550948678eea2ed6b524372f6673ecaf508f89057b3a0419a3f2a1c986f0
--- a/sys-apps/calculate-assemble/calculate-assemble-2.2.28-r3.ebuild
+++ b/sys-apps/calculate-assemble/calculate-assemble-2.2.28-r3.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+inherit distutils eutils
+
+SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="~sys-apps/calculate-builder-2.2.28"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# add python updater executing
+	epatch "${FILESDIR}/calculate-assemble-2.2.28-python_updater.patch"
+
+	# add downgrade checking
+	epatch "${FILESDIR}/calculate-assemble-2.2.28-downgrade_check.patch"
+}
--- a/sys-apps/calculate-assemble/files/calculate-assemble-2.2.28-downgrade_check.patch
+++ b/sys-apps/calculate-assemble/files/calculate-assemble-2.2.28-downgrade_check.patch
@ -1,11 +1,11 @@
-commit bff5b35c4466d593eacc7b902298ccabffdf4884
+commit c389ce74128d9c01fa65f49a2d082aa881d3c07a
 Author: Хирецкий Михаил <mh@calculate.ru>
 Date:   Wed Apr 4 10:48:25 2012 +0400

    Add downgrade checking.

 diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
-index a7521d6..2c52d6a 100644
+index a7521d6..dd8110a 100644
 --- a/pym/cl_assemble.py
 +++ b/pym/cl_assemble.py
@@ -227,7 +227,11 @@ class cl_assemble(color_print):
@ -14,10 +14,24 @@ index a7521d6..2c52d6a 100644
               'message':_("Reading news"),
 -              'progname':'eselect'}]
 +              'progname':'eselect'},
-+             {'command':"FORMAT='{downgrade}%{FORMAT_ALL}{}' eix -I",
+             {'command':"checkDowngrades()",
 +              'message':_("Checking downgrades"),
 +              'step':'showdowngrade',
 +              'progname':'eix'}]
 
     reVerSplit = re.compile(r"^(.*?)-(([^-]+?)(?:-(r\d+))?)(?:.(tbz2))?$",re.S)
 
+@@ -1388,6 +1392,13 @@ class cl_assemble(color_print):
+                 _("An error occurred when executing the command")+
+                   ":\n    %s"%self._getCommand(cmd.command))
+ 
+    def checkDowngrades(self):
+        """Run check downgrades"""
+        cmd = self.runChroot("FORMAT='{downgrade}%{FORMAT_ALL}{}' eix -I",
+                             raiseError=False,
+                             showProcess=True)
+        return True
+
+     def modulesRebuild(self):
+         """Run revdep-rebuild and check result"""
+         if not self.assemblePath:
--- a/sys-apps/calculate-utilities/Manifest
+++ b/sys-apps/calculate-utilities/Manifest
@ -60,6 +60,7 @@ EBUILD calculate-utilities-2.2.27-r9.ebuild 879 RMD160 552f135c61218005321e58529
 EBUILD calculate-utilities-2.2.27.ebuild 861 RMD160 d840018012b50f856de0042966facf8ee93007b9 SHA1 3f805525a322977dcb6cc442dcd933c90855c175 SHA256 1a2a97e4dde488e880820a5a97ff974ae3dd068c2d894a9b962c35d24dad4eec
 EBUILD calculate-utilities-2.2.28-r1.ebuild 857 RMD160 04995d8aa9f65a078877c173262b54fb8400ed71 SHA1 ad08c121ad5be596a261afc96464f7d550c28267 SHA256 49f1d150a1378ca49238fb6d004282d08a1aae36b50f2e7964ad73394ff2a71e
 EBUILD calculate-utilities-2.2.28-r10.ebuild 866 RMD160 2dc1d3d9af8136e7f9e54e887284959eb80adb21 SHA1 5b0a050782eca6a79f61c28fddb6201ad385a0ef SHA256 2f2756e9a48b5f8b76b16b50ce2fb8230d7838c9af0158b77a92bfbfe39fcd93
+EBUILD calculate-utilities-2.2.28-r11.ebuild 866 RMD160 803523f972d942f75bbb484312e9558cea596ad2 SHA1 1280143fca032fce18cb9fff55c51ac744910cda SHA256 f68798dde7cb0d210bba27ab9753c227fb107af3a0649fee780be0d463d03cdc
 EBUILD calculate-utilities-2.2.28-r2.ebuild 860 RMD160 b56c73b3c4a4154889f7d77b2e953357d23c842d SHA1 5ca3456fe37e9324985f47ca095ae19bdc2c0bc1 SHA256 a585335e343c470cd91c8f1ec3814d3e64343f022e66215be86064e65e858e25
 EBUILD calculate-utilities-2.2.28-r3.ebuild 863 RMD160 c13c0edb76be7060853cf425c4204a056df9d7d1 SHA1 98d05c7deb5868b6a0f0cf9776009670dc00bb0f SHA256 4d47839f2c7513cf4e5a0ea0c49168ba72e83e9b5f7a9f49a8270308fe9e5b11
 EBUILD calculate-utilities-2.2.28-r4.ebuild 863 RMD160 0810acb8c13bf278c23824d543bbd3b2b9762087 SHA1 2cdf83114749a71b8ccebbdafedf86bf08671436 SHA256 6e0137409a878b8d7b771c7b0ae379c017ba0411d06b89f49a3ee94f292c33ba
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.28-r11.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.28-r11.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+DESCRIPTION="Calculate Utilities meta package"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+SRC_URI=""
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="
+cl_assemble
+cl_builder
+cl_client
+cl_desktop
+cl_installgui
+cl_server
+"
+
+RDEPEND="${RDEPEND}
+	!sys-apps/calculate-templates
+	=sys-apps/calculate-install-2.2.28-r1
+	=sys-apps/calculate-lib-2.2.28-r5
+	=sys-apps/calculate-i18n-2.2.28
+
+	cl_assemble? ( =sys-apps/calculate-assemble-2.2.28-r3 )
+	cl_builder? ( =sys-apps/calculate-builder-2.2.28 )
+	cl_client? ( =sys-apps/calculate-client-2.2.28-r1 )
+	cl_desktop? ( =sys-apps/calculate-desktop-2.2.28 )
+	cl_installgui? ( =app-misc/calculate-install-gui-2.2.28 )
+
+	cl_server? ( =sys-apps/calculate-server-2.1.15-r5 )
+"