forked from calculate/calculate-overlay
parent
4e81e503c9
commit
145ef34914
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.18
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.19
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.20
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# remove adding "/dev/" for all devices values.
|
||||
epatch "${FILESDIR}/calculate-install-gui-2.2.20-r1.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.20
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.21
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.22
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="GUI frontend for the program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-install-2.2.23
|
||||
x11-libs/qtermwidget
|
||||
x11-libs/qt-core"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
CMAKE_PREFIX_PATH=/usr cmake .
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "make failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die 'make install failed'
|
||||
dodoc README
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
commit 0de8143d615685790d1559eeea57881a957ded4f
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Wed Aug 17 10:29:07 2011 +0400
|
||||
|
||||
Discard adding prefix "/dev/" for devices values.
|
||||
|
||||
diff --git a/src/calculateconfig.cpp b/src/calculateconfig.cpp
|
||||
index f223e12..65fb77c 100644
|
||||
--- a/src/calculateconfig.cpp
|
||||
+++ b/src/calculateconfig.cpp
|
||||
@@ -69,7 +69,7 @@ bool CalculateConfig::getDefaultConfig()
|
||||
|
||||
QStringList devs = m_Config["os_device_dev"].toStringList();
|
||||
m_Config.remove("os_device_dev");
|
||||
- m_Config["os_device_dev"] = preparePartitions(devs);
|
||||
+ m_Config["os_device_dev"] = devs;
|
||||
|
||||
if ( !m_Config["os_device_dev"].toStringList().isEmpty() )
|
||||
m_Config["gui_os_device_dev"] = m_Config["os_device_dev"].toStringList().at(0);
|
||||
@@ -146,7 +146,7 @@ bool CalculateConfig::getNewPartitioning()
|
||||
QStringList devs = confDisk["os_device_dev"].toStringList();
|
||||
|
||||
m_Config.remove("os_device_dev");
|
||||
- m_Config["os_device_dev"] = preparePartitions(devs);
|
||||
+ m_Config["os_device_dev"] = devs;
|
||||
|
||||
m_Config.remove("os_disk_dev");
|
||||
m_Config["os_disk_dev"] = confDisk["os_disk_dev"];
|
||||
@@ -225,20 +225,6 @@ bool CalculateConfig::getNewMountpoints()
|
||||
return true;
|
||||
}
|
||||
|
||||
-QStringList CalculateConfig::preparePartitions(const QStringList& parts)
|
||||
-{
|
||||
- QStringList devs(parts);
|
||||
- QStringList::iterator dev = devs.begin();
|
||||
-
|
||||
- while ( dev != devs.end() )
|
||||
- {
|
||||
- *dev = "/dev/"+*dev;
|
||||
- ++dev;
|
||||
- }
|
||||
-
|
||||
- return devs;
|
||||
-}
|
||||
-
|
||||
QStringList CalculateConfig::getPasswordUsers()
|
||||
{
|
||||
QStringList result;
|
||||
diff --git a/src/calculateconfig.h b/src/calculateconfig.h
|
||||
index 77931a7..47a3f46 100644
|
||||
--- a/src/calculateconfig.h
|
||||
+++ b/src/calculateconfig.h
|
||||
@@ -39,8 +39,6 @@ private:
|
||||
CalculateConfig(const CalculateConfig&);
|
||||
CalculateConfig& operator=(const CalculateConfig&);
|
||||
|
||||
- QStringList preparePartitions(const QStringList& parts);
|
||||
-
|
||||
void parseVariables(const QDomNode& node, MapConfig& cfg);
|
||||
void parseVar(const QDomNode& node, MapConfig& cfg);
|
||||
void parseVarList(const QDomNode& node, MapConfig& cfg);
|
||||
@@ -51,4 +49,4 @@ private:
|
||||
static CalculateConfig* _instance;
|
||||
|
||||
MapConfig m_Config;
|
||||
-};
|
||||
\ No newline at end of file
|
||||
+};
|
||||
@ -1,27 +1,5 @@
|
||||
AUX calculate-assemble-2.2.19_2.2.20_rc1.patch 8966 RMD160 03d7a9cd1618024297516c589500a29038d462eb SHA1 30368ed435082461f1649f2707e595a50f50e045 SHA256 1793266fead73af7f8b1cc391ea49a78d53f36749982dba248d3fa93ae04827b
|
||||
AUX calculate-assemble-2.2.20-display_deps.patch 3079 RMD160 d16172ee69262d0237e40cadee96bf345f2a232e SHA1 1ee60f16746c843454644499bfd61170a4d2f9af SHA256 5ea0b6ca3f3edf3efe1ea2cbe2e3577bf91813513a997b36791935241a8c766b
|
||||
AUX calculate-assemble-2.2.20-fix_disk_dev.patch 765 RMD160 7e37e874e4d2508833c4d3707fbe1eadf44c30d6 SHA1 a81c11334684c5cb868efa42db584ca3ad0f059c SHA256 9f1a65f07370c00d0e17c2273da50aaa91368a921f7ae065dca4569cc6ebfa13
|
||||
AUX calculate-assemble-2.2.21-r1.patch 4446 RMD160 c1b14f8abd0c590c9e95ce240b660d0ecc8e8948 SHA1 a96932a08140ac3751454c403c2f9423b8e534c0 SHA256 5c42ee4b07a2905992b4128cb759a48f26745af1ee53ac621ebe0fdf2d2847f8
|
||||
AUX calculate-assemble-2.2.22-r1.patch 2593 RMD160 47ce26b90ffa010a83553d67e46973a64a05e756 SHA1 c850b68e7053e6542bc0687043c2a116fd27ee56 SHA256 d831ed3d6bb7fbb8c40a66cfef9082ae2ac5426828dabfb983a51c94f1ff6426
|
||||
DIST calculate-assemble-2.2.18.tar.bz2 33018 RMD160 2c3ae7f1d27c3ad8d5f956d08fa3a676bad8831c SHA1 93737556574d527aae29221a8fe1a0849b962a43 SHA256 25953004f54550c54491498c8bde11fd0761b17bf830d12b0c3a4b6028fd5713
|
||||
DIST calculate-assemble-2.2.19.tar.bz2 25088 RMD160 ec39e5cd4a331da903555bd01c41ee1c9090a25a SHA1 c88a78cd82bc6307ce1763ce1421a54d2870e8af SHA256 84f4a4346d438a6a978783db4b6206c22ee0b0eb0026aff191c9af908bf4d43b
|
||||
DIST calculate-assemble-2.2.20.tar.bz2 25241 RMD160 6e318195c86b332c100cb7d8737c35305bd2f10a SHA1 a410e30320c5cfc37ef1a34e8cdd70aafe8dbded SHA256 d606729494cc6883d4553cbdc5d0393811afeca714731760e63886ad8af2f01c
|
||||
DIST calculate-assemble-2.2.21.tar.bz2 25460 RMD160 f0f0a9864005ce4a496d53475c2e8706602295e9 SHA1 bdbaa24db031a54c6f9f169485122b306ad35418 SHA256 888f60da5006278d0a108117d8c863c6dfa46540c2a9ef7c0f47ffbc7bd219bd
|
||||
DIST calculate-assemble-2.2.22.tar.bz2 25471 RMD160 f4fb58259a24e5136164874b82e3aad364ba17a3 SHA1 ced054cf3b86bcd6cf6a8a5ebbc1c8c2ebf96f8a SHA256 da5e309b23c49ee5811f31c2717c1641ba8c72f7c415d578bb36784fa2555714
|
||||
DIST calculate-assemble-2.2.23.tar.bz2 25471 RMD160 1e3a313bb8ec9d32af7c95342caa1cd7ab25be9d SHA1 1c7fb1488147a0954ec59da9109ba3cc9ac82016 SHA256 ae1cf44b2bb2319f58355a9ac4d804bc04470847200428ac77ca2aefd2f8fdf2
|
||||
DIST calculate-assemble-2.2.24.tar.bz2 25474 RMD160 23e96efd45458af4529bec3e99bda53dccbdefb2 SHA1 04d143480458094f86e44c12d37b9f2fe77de769 SHA256 d0bf55d2132c083447a4014a8466ce2ed10b72ed23072481d66bebd696f928ad
|
||||
EBUILD calculate-assemble-2.2.18.ebuild 481 RMD160 f347bb36ff1df0ca76adf4a094b77641b4ea33ab SHA1 112d1543752d06d60d6a89e8ef209ffd1b436bf3 SHA256 c3cc49d4b67ee1c26c1e85ef2003372404f54acd50bc73b1a4021f2f612e5013
|
||||
EBUILD calculate-assemble-2.2.19-r1.ebuild 615 RMD160 a2a3d5b4605f75b017a8382838462e3f89700cd1 SHA1 1b6670679ea00d19620c3d1860f198ae1151acee SHA256 2d35114b6806908d62f3a35e4a5225adb4ac7b4207ccb594bf8d5f87a75391e8
|
||||
EBUILD calculate-assemble-2.2.19.ebuild 481 RMD160 a62e8dff13102f6177e7613f865e7be9e0ac0678 SHA1 baa39989854e66c624d50e3d5bbdc751f4c58718 SHA256 0483a32dd3c412eb7c51f7384f9791c308fd746bd23418fc46956a1d1d22cb30
|
||||
EBUILD calculate-assemble-2.2.20-r1.ebuild 633 RMD160 b87a5a4c18f1e2c4df4b7c3fc7176c167e11324a SHA1 674f1a74e5f894e2b21f6025f6f779a559aed7c1 SHA256 57e015406b8721a4d72ad5000824a7355eeea56f6ac4197715fc801b6d7174f9
|
||||
EBUILD calculate-assemble-2.2.20-r2.ebuild 730 RMD160 5aba49bb15e3cf5b8db0e18583393f35b8b5c5ed SHA1 83ac8f370db3e9e19d06e882e997d05adff3ca0a SHA256 7ad30ac668bb8e8806d39d7cdbfb738c6fbc0518584bd9f4240784233b1b9e72
|
||||
EBUILD calculate-assemble-2.2.20.ebuild 481 RMD160 0dbf26e99b73a2ed32fa64aae37041954b432f8c SHA1 1ab75e7e4b1e7aa7bd0b7fba1dca7ea080b0c60c SHA256 6bf79b34ee46ab93dd17ac7bd75a5d073aa7a79daa83e58a85ee3f99301c2fbe
|
||||
EBUILD calculate-assemble-2.2.21-r1.ebuild 598 RMD160 e2c5ededba4f4baf850222ddcd77affc2d98afbb SHA1 75b3760188ee350831ee60b85214b6bdcb874b08 SHA256 9335f9606a96044faa2ea00bc1f4e567c1d218600f4ffbf8acc6cf776972e0a5
|
||||
EBUILD calculate-assemble-2.2.21.ebuild 481 RMD160 69d8ff833b54faf18a7b969fd7f9831458ab89ee SHA1 5c4384299f784a2c086624256e933a7299278474 SHA256 e1037ab96c92fbeb3a1556489d6776e8e2c872c2a534296a09fca51dd0d4892a
|
||||
EBUILD calculate-assemble-2.2.22-r1.ebuild 627 RMD160 bdfcedf0d695dda682d6019aa129ed1007eb875b SHA1 49cb69f47fc8fd1692ea9e866c0498fac2a8e65c SHA256 a9b00671691d0dbd07a5930eb65093804d9467d5ca996ff1019d2865e5dfd22f
|
||||
EBUILD calculate-assemble-2.2.22.ebuild 481 RMD160 d604c2b39e810c227f68a8a028b466a43d80c1ae SHA1 eaba40323101b3ab6e47ff5e1d67828b627f133e SHA256 425d6e07a2fe814e2f96256d51780a8617b558efeee619ae39376cfaeb913025
|
||||
EBUILD calculate-assemble-2.2.23.ebuild 482 RMD160 0c480f6eb93d57e7cd0d1af8a4fd1c08a65b245f SHA1 f321395c65344a3c4e1ebcae4760f455f066b21a SHA256 45ae99423db6015b88b70a78533b6b8f98ffa7d4c00aebb3539f4a3460e70710
|
||||
EBUILD calculate-assemble-2.2.24.ebuild 482 RMD160 af9f45c1bb240d0b1ce056cabef3da1da64f0e6f SHA1 727683764f08fb082f421ad743db286a0ce67387 SHA256 9487334ee1908d20b95c007c6b0cfdbeb6c5f40a349b25f95ac77c4080e376c3
|
||||
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 a8dd82b9ec70dd999e13c509f0f11f303bdbf5c7 SHA1 a5218cd678aa8d213ee8455874e7ea0b07246ebc SHA256 2c0fed30ccde6401d214a6de67dc63a0c91fd025508efb3519db9b2cda800ec9
|
||||
MISC ChangeLog 13004 RMD160 0bc23c084e1c9d9d9e1e30a5dbafbeafae45077a SHA1 b100bc3bdc81ef0bcdebf05ddac7350882fcc8ce SHA256 abc93d02cd52a90f4ec5728539258ea672dbc9a1c5828c44992173ecddc3deab
|
||||
MISC ChangeLog 13743 RMD160 72cd701cc3f3b780bee0dd640ee9268fc3db713a SHA1 976a61c4614d28c304923866092c3b31dd14cc2c SHA256 93abb82527207d5d5fc4c09794fde28f0115ba293845710806585c00719ed4a9
|
||||
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 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.18"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2011 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.19"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update to 2.2.20_rc1
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.19_2.2.20_rc1.patch"
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 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.19"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2011 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.20"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add display proprietary drivers deps
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.20-display_deps.patch"
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
# Copyright 1999-2011 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.20"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add display proprietary drivers deps
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.20-display_deps.patch"
|
||||
# fix detect available disks
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.20-fix_disk_dev.patch"
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 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.20"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2011 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.21"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# some bugfix
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.21-r1.patch"
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 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.21"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,27 +0,0 @@
|
||||
# Copyright 1999-2011 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.22"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add support use directory for assembling
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.22-r1.patch"
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2011 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.22"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2011 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.23"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@ -1,199 +0,0 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 81517ba..616e6dd 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -97,6 +97,7 @@ class cl_assemble(color_print):
|
||||
# progname - check by 'which' existing this program
|
||||
# hideout - hide stdout
|
||||
# foraction - perform only for cl_action == value
|
||||
+ DEFAULT_FORACTION = ('make','syncupdate','update')
|
||||
ACTION_LIST = \
|
||||
[
|
||||
# emerge -e system first
|
||||
@@ -117,7 +118,7 @@ class cl_assemble(color_print):
|
||||
'foraction':('make',)},
|
||||
# update prepareTemplates
|
||||
{'command':"prepareTemplates()",
|
||||
- 'foraction':('syncupdate','update'),
|
||||
+ 'foraction':('syncupdate','update','applytemplates'),
|
||||
'hideout':True,
|
||||
'message':_("Configurate by %s templates")% "assemble"
|
||||
},
|
||||
@@ -296,6 +297,8 @@ class cl_assemble(color_print):
|
||||
self.clVars.Set("cl_action","syncupdate",True)
|
||||
elif action == "dependence":
|
||||
self.clVars.Set("cl_action","dependence",True)
|
||||
+ elif action == "applytemplates":
|
||||
+ self.clVars.Set("cl_action","applytemplates",True)
|
||||
else:
|
||||
self.clVars.Set("cl_action","configure",True)
|
||||
|
||||
@@ -876,10 +879,16 @@ class cl_assemble(color_print):
|
||||
return self.make(self.makeFunc,force,True,False)
|
||||
|
||||
def updateSystem(self,force,withsync=True):
|
||||
- self.msgOperationComplete = \
|
||||
- _("System assembled is successfully")+"!"
|
||||
- self.msgOperationFailed = \
|
||||
- _("System compiling failed")
|
||||
+ if self.clVars.Get('cl_action') == "applytemplates":
|
||||
+ self.msgOperationComplete = \
|
||||
+ _("Templates appling is successfully")+"!"
|
||||
+ self.msgOperationFailed = \
|
||||
+ _("Templates appling failed")
|
||||
+ else:
|
||||
+ self.msgOperationComplete = \
|
||||
+ _("System assembled is successfully")+"!"
|
||||
+ self.msgOperationFailed = \
|
||||
+ _("System compiling failed")
|
||||
if not self._pidCheck():
|
||||
return False
|
||||
stepWorld = filter(lambda x:x,
|
||||
@@ -926,7 +935,7 @@ class cl_assemble(color_print):
|
||||
# cancel if action make
|
||||
if forcesystem:
|
||||
return True
|
||||
- else:
|
||||
+ elif self.clVars.Get('cl_action') != "applytemplates":
|
||||
# print warning and drop force option
|
||||
self.printWARNING(_("WARNING") +": " +
|
||||
_("assemble already finished"))
|
||||
@@ -1039,7 +1048,8 @@ class cl_assemble(color_print):
|
||||
if "progname" in action:
|
||||
if not self._checkChrootProgram(action["progname"]):
|
||||
continue
|
||||
- if "foraction" in action and not actionName in action["foraction"]:
|
||||
+
|
||||
+ if not actionName in action.get('foraction',self.DEFAULT_FORACTION):
|
||||
continue
|
||||
if "command" in action:
|
||||
command = action["command"]
|
||||
@@ -1072,7 +1082,7 @@ class cl_assemble(color_print):
|
||||
if not "command" in action:
|
||||
continue
|
||||
# if specified "progname" check by which in chroot this prog
|
||||
- if "foraction" in action and not actionName in action["foraction"]:
|
||||
+ if not actionName in action.get('foraction',self.DEFAULT_FORACTION):
|
||||
continue
|
||||
command = action["command"]
|
||||
if "args" in action:
|
||||
@@ -1402,11 +1412,11 @@ class cl_assemble(color_print):
|
||||
"""Fetch propreitary drivers"""
|
||||
if self.clVars.Get('cl_assemble_withvideo_set') == "on":
|
||||
drivers = [
|
||||
- ('nvidia-drivers 260.XX.XX',
|
||||
+ ('nvidia-drivers',
|
||||
'x11-drivers/nvidia-drivers'),
|
||||
- ('nvidia-drivers 173.XX.XX',
|
||||
+ ('nvidia-drivers',
|
||||
'\\<x11-drivers/nvidia-drivers-174'),
|
||||
- ('nvidia-drivers 96.XX.XX',
|
||||
+ ('nvidia-drivers',
|
||||
'\\<x11-drivers/nvidia-drivers-97'),
|
||||
('ati-drivers',
|
||||
'x11-drivers/ati-drivers')
|
||||
@@ -1433,8 +1443,30 @@ class cl_assemble(color_print):
|
||||
while drivers:
|
||||
repeatDrivers = []
|
||||
for verName,drvVer in drivers:
|
||||
+ checkprocess = self.runChroot(
|
||||
+ "emerge -p %s"%
|
||||
+ drvVer, raiseError=False,joinErr=True)
|
||||
+ checkprocess = self.runChroot(
|
||||
+ "emerge -vp %s"%
|
||||
+ drvVer,raiseError=False,joinErr=True)
|
||||
+ rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
|
||||
+ # get version from emerging nvidia-driver
|
||||
+ nvidiaVersions = \
|
||||
+ map(lambda x:x.groups()[1],
|
||||
+ filter(lambda x:x,
|
||||
+ map(self.reVerSplit.search,
|
||||
+ map(lambda x:x.groups()[0],
|
||||
+ filter(lambda x:x,
|
||||
+ map(rePackage.search,
|
||||
+ filter(lambda x:verName in x,
|
||||
+ checkprocess)))))))
|
||||
+
|
||||
+ if nvidiaVersions:
|
||||
+ nvidiaVersions = nvidiaVersions[0]
|
||||
+ else:
|
||||
+ nvidiaVersions = "0"
|
||||
self.printMessageForTest(" " +
|
||||
- _("Fetching %s")%verName)
|
||||
+ _("Fetching %s")%"%s-%s"%(verName,nvidiaVersions))
|
||||
# run verbose package emergin for get version
|
||||
fetchprocess = self.runChroot(
|
||||
"emerge -f %s"%
|
||||
diff --git pym/cl_make_cmd.py pym/cl_make_cmd.py
|
||||
index 003ca42..069f868 100644
|
||||
--- pym/cl_make_cmd.py
|
||||
+++ pym/cl_make_cmd.py
|
||||
@@ -43,6 +43,10 @@ CMD_OPTIONS = [{'shortOption':"D",
|
||||
'longOption':"update-without-sync",
|
||||
'help':_("update system without performing eix-sync")
|
||||
},
|
||||
+ {'shortOption':"T",
|
||||
+ 'longOption':"apply-templates",
|
||||
+ 'help':_("configure by %s templates")% "assemble"
|
||||
+ },
|
||||
{'longOption':"break",
|
||||
'help':_("break system assembling")
|
||||
},
|
||||
@@ -81,11 +85,12 @@ class make_cmd(assemble_cmd):
|
||||
opt.color_control,
|
||||
check_values=self.checkOpts)
|
||||
self.logicObj = cl_assemble()
|
||||
- self.optionsBreakIncompatible=["U","skipfirst","m","u","D"]
|
||||
- self.optionsDependenceIncompatible=["U","skipfirst","m","u","break"]
|
||||
- self.optionsMakeIncompatible=["U","D","u","break"]
|
||||
- self.optionsUpdateIncompatible=["U","m","D","break"]
|
||||
- self.optionsUpdatenosyncIncompatible=["D","m","u","break"]
|
||||
+ self.optionsBreakIncompatible=["U","skipfirst","m","u","D","t"]
|
||||
+ self.optionsDependenceIncompatible=["U","skipfirst","m","u","break","t"]
|
||||
+ self.optionsMakeIncompatible=["U","D","u","break","t"]
|
||||
+ self.optionsUpdateIncompatible=["U","m","D","break","t"]
|
||||
+ self.optionsUpdatenosyncIncompatible=["D","m","u","break","t"]
|
||||
+ self.optionsApplytemplatesIncompatible=["D","m","u","break","U"]
|
||||
|
||||
def checkOpts(self, values, args):
|
||||
"""Check values all specified options."""
|
||||
@@ -110,11 +115,14 @@ class make_cmd(assemble_cmd):
|
||||
self.checkIncompatibleParam("update")
|
||||
if values.U:
|
||||
self.checkIncompatibleParam("update-nosync")
|
||||
+ if values.T:
|
||||
+ self.checkIncompatibleParam("applytemplates")
|
||||
if not (values.m or getattr(values,"break") or
|
||||
- values.D or values.u or values.U):
|
||||
+ values.D or values.u or values.U or values.T):
|
||||
self.optobj.error(
|
||||
_("need specify action: make (-m),"
|
||||
- " break (--break), update (-u|-U) or check dependence (-D)"))
|
||||
+ " break (--break), update (-u|-U), apply templates (-T)"
|
||||
+ " or check dependence (-D)"))
|
||||
return (values, args)
|
||||
|
||||
def setAction(self):
|
||||
@@ -127,6 +135,8 @@ class make_cmd(assemble_cmd):
|
||||
action = "syncupdate"
|
||||
elif self.optobj.values.U:
|
||||
action = "update"
|
||||
+ elif self.optobj.values.T:
|
||||
+ action = "applytemplates"
|
||||
else:
|
||||
action = "dependence"
|
||||
self.logicObj.setAction(action)
|
||||
diff --git scripts/cl-make scripts/cl-make
|
||||
index f89c2fe..40259e1 100644
|
||||
--- scripts/cl-make
|
||||
+++ scripts/cl-make
|
||||
@@ -58,6 +58,9 @@ if __name__ == "__main__":
|
||||
if options.u:
|
||||
if not assemble.updateSystem(options.f):
|
||||
sys.exit(1)
|
||||
+ if options.T:
|
||||
+ if not assemble.updateSystem(options.f,False):
|
||||
+ sys.exit(1)
|
||||
if options.U:
|
||||
if not assemble.updateSystem(options.f,False):
|
||||
sys.exit(1)
|
||||
@ -1,68 +0,0 @@
|
||||
commit 38d1dc4538badc93b292182366c9a171734d0a9a
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Mon Aug 15 16:19:53 2011 +0400
|
||||
|
||||
Add display dep packages for proproitary drivers.
|
||||
|
||||
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
|
||||
index 72f4e57..e6f4fcf 100644
|
||||
--- a/pym/cl_assemble.py
|
||||
+++ b/pym/cl_assemble.py
|
||||
@@ -1443,13 +1443,16 @@ class cl_assemble(color_print):
|
||||
while drivers:
|
||||
repeatDrivers = []
|
||||
for verName,drvVer in drivers:
|
||||
+ rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
|
||||
checkprocess = self.runChroot(
|
||||
- "emerge -p %s"%
|
||||
+ "emerge -pv %s"%
|
||||
drvVer, raiseError=False,joinErr=True)
|
||||
- checkprocess = self.runChroot(
|
||||
- "emerge -vp %s"%
|
||||
- drvVer,raiseError=False,joinErr=True)
|
||||
- rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
|
||||
+ # get names of dep packages
|
||||
+ installPkgList = \
|
||||
+ map(lambda x:x.group(1),
|
||||
+ filter(lambda x:x,
|
||||
+ map(rePackage.search,
|
||||
+ checkprocess)))
|
||||
# get version from emerging nvidia-driver
|
||||
nvidiaVersions = \
|
||||
map(lambda x:x.groups()[1],
|
||||
@@ -1459,13 +1462,25 @@ class cl_assemble(color_print):
|
||||
filter(lambda x:x,
|
||||
map(rePackage.search,
|
||||
filter(lambda x:verName in x,
|
||||
- checkprocess)))))))
|
||||
+ checkprocess.readlines())))))))
|
||||
|
||||
if nvidiaVersions:
|
||||
nvidiaVersions = nvidiaVersions[0]
|
||||
else:
|
||||
nvidiaVersions = "0"
|
||||
- self.printMessageForTest(" " +
|
||||
+ self.printSUCCESS(_("For installation '%s' will be "
|
||||
+ "installed follow packages")
|
||||
+ %"%s-%s"%(verName,nvidiaVersions)+":")
|
||||
+ # print dep packages (error message for probably wrong packages)
|
||||
+ nameRight = "/%s-"%verName.partition("-")[0]
|
||||
+ for pkg in installPkgList:
|
||||
+ if nameRight in pkg:
|
||||
+ self.printSUCCESS(" %s"%pkg)
|
||||
+ else:
|
||||
+ self.printERROR(" %s"%pkg)
|
||||
+ if installPkgList:
|
||||
+ self.printSUCCESS("")
|
||||
+ self.printMessageForTest(
|
||||
_("Fetching %s")%"%s-%s"%(verName,nvidiaVersions))
|
||||
# run verbose package emergin for get version
|
||||
fetchprocess = self.runChroot(
|
||||
@@ -1484,6 +1499,7 @@ class cl_assemble(color_print):
|
||||
else:
|
||||
self.printByResult(fetchprocess.success())
|
||||
needFiles += fetchedFiles
|
||||
+ self.defaultPrint("\n")
|
||||
drivers = repeatDrivers
|
||||
if drivers:
|
||||
self.printMessageForTest(" " +
|
||||
@ -1,20 +0,0 @@
|
||||
commit ced695df30d22c304558eb3ef895fd33b97612a4
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue Aug 16 18:01:57 2011 +0400
|
||||
|
||||
Fix detect available device for assemble.
|
||||
|
||||
diff --git a/pym/cl_fill_assemble.py b/pym/cl_fill_assemble.py
|
||||
index 1130ccf..b729ca3 100644
|
||||
--- a/pym/cl_fill_assemble.py
|
||||
+++ b/pym/cl_fill_assemble.py
|
||||
@@ -194,7 +194,8 @@ class fillVars(installFillVars):
|
||||
|
||||
def get_os_disk_dev(self):
|
||||
reSdaPart = re.compile("^/dev/sd([a-z])(\d+)$")
|
||||
- devices = self.Get('os_device_hash').keys()
|
||||
+ devices = map(lambda x:path.basename(x),
|
||||
+ self.Get('os_device_hash').keys())
|
||||
disks = reduce( lambda x,y: x +
|
||||
map( lambda x: "/dev/%s"%x,
|
||||
filter(lambda x: y in x,
|
||||
@ -1,104 +0,0 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 126f263..3da2a6a 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -1632,51 +1632,54 @@ class cl_assemble(color_print):
|
||||
self.clVars.Get('cl_assemble_pkgdir'))
|
||||
dbPkg = pathJoin(chrootPath, 'var/db/pkg')
|
||||
|
||||
- if not path.exists(dbPkg):
|
||||
- os.makedirs(dbPkg)
|
||||
- if not path.exists(pkgDir):
|
||||
- os.makedirs(pkgDir)
|
||||
- if path.exists(dbPkg) and path.exists(pkgDir):
|
||||
- # get pkg list from distro
|
||||
- pkgList = \
|
||||
- reduce(lambda x,y:x+y,
|
||||
- map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z),
|
||||
- os.listdir(path.join(dbPkg,x))),
|
||||
- os.listdir(dbPkg)),[])
|
||||
- # get binary packages
|
||||
- binList = \
|
||||
- reduce(lambda x,y:x+y,
|
||||
- map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:],
|
||||
- os.listdir(path.join(x))),
|
||||
- filter(lambda x:path.isdir(x),
|
||||
- map(lambda x:path.join(pkgDir,x),
|
||||
- os.listdir(pkgDir)))),[])
|
||||
-
|
||||
- # remove files which in binary and not in db/pkg
|
||||
- map(lambda x:os.unlink(x),
|
||||
- map(lambda x:pathJoin(pkgDir,x),
|
||||
- list(set(binList)-set(pkgList))))
|
||||
-
|
||||
- # remove empty directories
|
||||
- map(lambda x:os.rmdir(x),
|
||||
- filter(lambda x:path.isdir(x) and not os.listdir(x),
|
||||
- map(lambda x:path.join(pkgDir,x),
|
||||
- os.listdir(pkgDir))))
|
||||
-
|
||||
- #packagesDir = 'usr/portage/packages'
|
||||
- #x11_drivers = 'x11-drivers'
|
||||
- #nvidiaDir = pathJoin(chrootPath, packagesDir,x11_drivers)
|
||||
-
|
||||
- #pkgDirX11Drivers = pathJoin(pkgDir,'x11-drivers')
|
||||
- #if not path.exists(pkgDirX11Drivers):
|
||||
- # os.makedirs(pkgDirX11Drivers,mode=0755)
|
||||
- #map(lambda x:copyfile(pathJoin(nvidiaDir,x),
|
||||
- # pathJoin(pkgDirX11Drivers,x)),
|
||||
- # listDirectory(nvidiaDir))
|
||||
-
|
||||
- self.regenPackages(chrootPath,pkgDir[len(chrootPath):])
|
||||
- else:
|
||||
- self.printByResult(skip=True)
|
||||
+ try:
|
||||
+ if not path.exists(dbPkg):
|
||||
+ os.makedirs(dbPkg)
|
||||
+ if not path.exists(pkgDir):
|
||||
+ os.makedirs(pkgDir)
|
||||
+ if path.exists(dbPkg) and path.exists(pkgDir):
|
||||
+ # get pkg list from distro
|
||||
+ pkgList = \
|
||||
+ reduce(lambda x,y:x+y,
|
||||
+ map(lambda x:map(lambda z:path.join(x,"%s.tbz2"%z),
|
||||
+ os.listdir(path.join(dbPkg,x))),
|
||||
+ os.listdir(dbPkg)),[])
|
||||
+ # get binary packages
|
||||
+ binList = \
|
||||
+ reduce(lambda x,y:x+y,
|
||||
+ map(lambda x:map(lambda z:path.join(x,z)[len(pkgDir)+1:],
|
||||
+ os.listdir(path.join(x))),
|
||||
+ filter(lambda x:path.isdir(x),
|
||||
+ map(lambda x:path.join(pkgDir,x),
|
||||
+ os.listdir(pkgDir)))),[])
|
||||
+
|
||||
+ # remove files which in binary and not in db/pkg
|
||||
+ map(lambda x:os.unlink(x),
|
||||
+ map(lambda x:pathJoin(pkgDir,x),
|
||||
+ list(set(binList)-set(pkgList))))
|
||||
+
|
||||
+ # remove empty directories
|
||||
+ map(lambda x:os.rmdir(x),
|
||||
+ filter(lambda x:path.isdir(x) and not os.listdir(x),
|
||||
+ map(lambda x:path.join(pkgDir,x),
|
||||
+ os.listdir(pkgDir))))
|
||||
+
|
||||
+ #packagesDir = 'usr/portage/packages'
|
||||
+ #x11_drivers = 'x11-drivers'
|
||||
+ #nvidiaDir = pathJoin(chrootPath, packagesDir,x11_drivers)
|
||||
+
|
||||
+ #pkgDirX11Drivers = pathJoin(pkgDir,'x11-drivers')
|
||||
+ #if not path.exists(pkgDirX11Drivers):
|
||||
+ # os.makedirs(pkgDirX11Drivers,mode=0755)
|
||||
+ #map(lambda x:copyfile(pathJoin(nvidiaDir,x),
|
||||
+ # pathJoin(pkgDirX11Drivers,x)),
|
||||
+ # listDirectory(nvidiaDir))
|
||||
+
|
||||
+ self.regenPackages(chrootPath,pkgDir[len(chrootPath):])
|
||||
+ else:
|
||||
+ self.printByResult(skip=True)
|
||||
+ except OSError,e:
|
||||
+ raise AssembleError(str(e))
|
||||
return True
|
||||
|
||||
def createMaskList(self,chrootdir,filename):
|
||||
@ -1,47 +0,0 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 98daa34..f1e77f1 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -320,9 +320,13 @@ class cl_assemble(color_print):
|
||||
self.clVars.Get('os_assemble_linux_ver'))
|
||||
self.printSUCCESS(_("Machine hardware name")+": %s"%
|
||||
self.clVars.Get('os_assemble_arch_machine'))
|
||||
- self.printSUCCESS(_("Partition for assembling: %s")%
|
||||
+ if path.isdir(self.clVars.Get('os_assemble_root_dev')):
|
||||
+ self.printSUCCESS(_("Directory for assembling: %s")%
|
||||
+ self.clVars.Get('os_assemble_root_dev'))
|
||||
+ else:
|
||||
+ self.printSUCCESS(_("Partition for assembling: %s")%
|
||||
self.clVars.Get('os_assemble_root_dev'))
|
||||
- self.printSUCCESS(_("File system: %s")%
|
||||
+ self.printSUCCESS(_("File system: %s")%
|
||||
self.clVars.Get('os_assemble_root_format'))
|
||||
if self.clVars.Get('cl_assemble_sync'):
|
||||
self.printSUCCESS(_("Portage rsync mirror: %s")%
|
||||
@@ -466,14 +470,18 @@ class cl_assemble(color_print):
|
||||
rootPartdev = self.clVars.Get('os_assemble_root_dev')
|
||||
formatId = PartitionDistributive.formatId
|
||||
fileSystem = self.clVars.Get('os_assemble_root_format')
|
||||
- return PartitionDistributive(rootPartdev,
|
||||
- mdirectory=self.clVars.Get('cl_assemble_path'),
|
||||
- check=True, fileSystem=fileSystem, isFormat=True,
|
||||
- systemId=formatId.get(fileSystem,"83"),
|
||||
- flagRemoveDir=False,
|
||||
- rootLabel="%s-%s"%
|
||||
- (self.clVars.Get('os_assemble_linux_shortname'),
|
||||
- self.clVars.Get('os_assemble_linux_ver')))
|
||||
+ if rootPartdev.startswith('/dev'):
|
||||
+ return PartitionDistributive(rootPartdev,
|
||||
+ mdirectory=self.clVars.Get('cl_assemble_path'),
|
||||
+ check=True, fileSystem=fileSystem, isFormat=True,
|
||||
+ systemId=formatId.get(fileSystem,"83"),
|
||||
+ flagRemoveDir=False,
|
||||
+ rootLabel="%s-%s"%
|
||||
+ (self.clVars.Get('os_assemble_linux_shortname'),
|
||||
+ self.clVars.Get('os_assemble_linux_ver')))
|
||||
+ else:
|
||||
+ return DirectoryDistributive(rootPartdev,
|
||||
+ mdirectory=self.clVars.Get('cl_assemble_path'))
|
||||
|
||||
def _prepareMount(self):
|
||||
"""Mount /proc,/sys, remote, /dev to chroot"""
|
||||
@ -1,29 +1,5 @@
|
||||
AUX calculate-builder-2.2.19_2.2.20_rc1.patch 1927 RMD160 5c5f11e5397b04c022bc3307fcc81defcacdf5c4 SHA1 eb0ff12a50ab216d5443b93023dfa201891f6a3b SHA256 5f9b5fa5ceebf676d464f71cdfa8a235653af628b0c6f19be5272c6688a640c5
|
||||
AUX calculate-builder-2.2.22-dispatch_conf.patch 1239 RMD160 964bfa44e5753c6e2154d4add40e97e2b54a7589 SHA1 4c5f3b0bc945c7533f72ad2b7e0b702f391537d7 SHA256 a2efa975a7881eb76009aab31e127fbb97e2a531a80cb815f40160855800960f
|
||||
AUX calculate-builder-2.2.22-kernel_3.patch 1033 RMD160 fcbdfd9d535903dea14b3bc82f15a98180e0de82 SHA1 88619bcb6f0b4017190afda551fcda834a29bbfb SHA256 b58f47845f95bb4efc22e1368c23ee3d8d17b36114c93d7dac4b2e60ef91c50f
|
||||
AUX calculate-builder-2.2.22-r3.patch 4925 RMD160 4fec64e34018c250127cc2ecbfb0e980c8ce618c SHA1 82847ef649e15a493320bffc850cef43d0c9693d SHA256 851cf855388047612d69207df25bbcab1ba3620a199546d82472ec4724d9bcf0
|
||||
AUX calculate-builder-2.2.23-r1.patch 1871 RMD160 e97efcf993c98b8935e19b243f950eef48585a27 SHA1 d9d30c85822a0e9aa1821467a18950352095271b SHA256 58a45117a0f5d19f391a70e73aee0548b6443227ac0cf9fa599591e3baf228a4
|
||||
AUX calculate-builder-2.2.23-r2.patch 1913 RMD160 6463e9e4e44200a878b67b8818e3499f261d023e SHA1 edca9edc1e91df70f2d9c83f40dd2021ecd1aef3 SHA256 07993000997987e03de5925b9ff132550d5a13f3791939e77f3cfb0476a659f8
|
||||
DIST calculate-builder-2.2.18.tar.bz2 30995 RMD160 de051bfc8def67c6adc7c08be6610ed022b0e079 SHA1 5271a56e017acaa0e9fe38fd6717d2ef5ecb4ac8 SHA256 0598342020ebb0008ad7a4ac66c42317663ac153c6f74ed313a7b020b2154c1c
|
||||
DIST calculate-builder-2.2.19.tar.bz2 26464 RMD160 82481411bd5976a3d217dd9a9889b6f90eca1ab2 SHA1 9dc278e441437b31fc6f6a79b41d9c1ec25d5102 SHA256 e87d392255e6de8453594ccde04f0385430bdcd605650e115be7c80ee3a53261
|
||||
DIST calculate-builder-2.2.20.tar.bz2 26589 RMD160 a313f05452a8d382d35d7b73203cc78d1431c8dc SHA1 887e68cc1c534f848ef0b8a795d6335b8a4ea42b SHA256 77a377f2bf66c408f4e77b1f96dd7484fb4ffad47b026e72ef0c2f19b3d27600
|
||||
DIST calculate-builder-2.2.21.tar.bz2 26610 RMD160 25ed01ab090a96d54402b27a8326c3dec1b62985 SHA1 c4aa29da941fe9960c73409b0e2cb894a6796a3c SHA256 d063fb57e4b51f60b63f7712d3c6642261c54fbd3b94fcfbdecb675089c7fcee
|
||||
DIST calculate-builder-2.2.22.tar.bz2 26603 RMD160 de7454fee6b923ff573f3d3860586926813dbaa0 SHA1 69cecfc934956aadc6d7b079934f6d91945a58bf SHA256 2d14865af60928dea4fa2be6298a0e4a74fd8bf111e570cf51bec03f7f038281
|
||||
DIST calculate-builder-2.2.23.tar.bz2 26846 RMD160 190230351d794715247a045a5b8b1c0d8d9f2b81 SHA1 8bc6aaa4063ceb6650c4974f96ccc3a100be5393 SHA256 7ffca455c4a4cefdc4511f400f35ee36f5c714fa973572ef2de92e89baaba87e
|
||||
DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
|
||||
EBUILD calculate-builder-2.2.18.ebuild 590 RMD160 33f7e1c0b350c5c68b30052f174d89e484f0af37 SHA1 86c7e9e00d10190d0db0dee02966d2ff03055d9f SHA256 440610752e8d783cd8ac18a3253456c81e7fb1f5373f1a420f0450f35de43776
|
||||
EBUILD calculate-builder-2.2.19-r1.ebuild 723 RMD160 008bf8285d8e32006284b45c801b035d07e35357 SHA1 7165464d9986d794939f5abf3d11098474264c74 SHA256 013b4552cc8fcf2f53e673efdd4109ca31d6ed5a48d063485dc0eee703546af2
|
||||
EBUILD calculate-builder-2.2.19.ebuild 590 RMD160 1f89c579d9ebf99dd5213f186ea755b83b77ec82 SHA1 fcfc550be07936b5386d9d955c1689ec167dda8f SHA256 25398c06fd102441f694d270cc9348795abbd2f20df0cf21eb7b3137d3b5e524
|
||||
EBUILD calculate-builder-2.2.20.ebuild 590 RMD160 ed36427d69477ee8998e23a9244a838b5920ed48 SHA1 2161372c3ab91218b3c81dd114711826605f79aa SHA256 a90dd01318fa33120651bb5928402de7544c9ae8bd2bbe788ca06366669bebfb
|
||||
EBUILD calculate-builder-2.2.21.ebuild 590 RMD160 77e8acd113dfe6c24eecf19d99fcb1a4b07e8ac6 SHA1 92380f0ac7886c46f338a604d7ee07f006149d5a SHA256 09126eca71ea6dd007f3f177e8c211dc5e582811b5cfed01c9459ca9a662177b
|
||||
EBUILD calculate-builder-2.2.22-r1.ebuild 727 RMD160 24da78b86f79ebb1d22511b183e11f46e661b636 SHA1 c31241a65f9fd1bd1668d6703eaa2b1257ebc646 SHA256 7c142796513b7ec88cd1b55bd9f5bbb8f5eef8fdd03542c0ae222644571d0bb3
|
||||
EBUILD calculate-builder-2.2.22-r2.ebuild 806 RMD160 36bb2e2c92bf9e1f5b744b8d0d01d953588e2898 SHA1 ce6206c45f2e47fdb300a381d7c165bf55179f3b SHA256 e33199093a79278d14e8385fb7591a95ac8a5f93e0470ac8a0cfef09c2e97140
|
||||
EBUILD calculate-builder-2.2.22-r3.ebuild 726 RMD160 bbf6a5b4ed42694b40f0af6e72a2db35d268bbc5 SHA1 f88b14f96289b8f3f8453b0d9e5f27373a60e350 SHA256 8e466868f25082026626be4c753634a1a2c1580a3f169727579a2197e4246179
|
||||
EBUILD calculate-builder-2.2.22.ebuild 590 RMD160 75600caab5c8d5c94f823138e8938aa01a1790f1 SHA1 254d7e611b5afa0bb5e4c267e292202e3eb8a7f6 SHA256 96fba1a295df4911021eeb3d3f3e9f9538a384a57e03e0f4e062e113cd52d75a
|
||||
EBUILD calculate-builder-2.2.23-r1.ebuild 711 RMD160 9e1033891254cf022070d9056a23a2291b172e22 SHA1 cad2f34cc7d9fafee0fdcc078667382e951005e4 SHA256 f2ed32ab3a0c23ea79cc6c09f88b5181ebd1d4556c03713107ab4a80718df207
|
||||
EBUILD calculate-builder-2.2.23-r2.ebuild 711 RMD160 0a84e2597769701ac484657c59e99e9092a90e61 SHA1 2e845129799131ffd57960bbce6909ba02877077 SHA256 08a019953df456aaf9521c57ac5f8a4cd1e67efef58134293679905869c64a30
|
||||
EBUILD calculate-builder-2.2.23.ebuild 588 RMD160 8cfa7c4db6df60d163479923cc98171cce34ce17 SHA1 c0acb3f57d9d56a9589a67e81857a7760e9e9084 SHA256 510850c5a7f99e22024d71c0add96825d82abee71709513ae91ad3e912cab520
|
||||
EBUILD calculate-builder-2.2.24.ebuild 588 RMD160 4ab4eb3ba650bf43594b70b68d9e3c9844d14bcf SHA1 f754e4af234393852b58ffbbbc8aff3d18408007 SHA256 1f138c0c6dca0195f43c4aca60a87632980ee9c2f7dcc3c8658d487c97b45ec4
|
||||
EBUILD calculate-builder-2.2.9999.ebuild 555 RMD160 e803b87aed06b8f08e2637e10213a0d81ba3ba0b SHA1 3ed908155f477cfa91155420d4fae903ce8db1da SHA256 fd6326f73e68d91f476498db381f2af62e742e3c461b609a8eb379dc417e1470
|
||||
MISC ChangeLog 16745 RMD160 0fb8671865220f2a5b75e2cd8bc97e7766dc7fd9 SHA1 331733d0ae87be669141f80a1be816051050a832 SHA256 a715f9e08ff85d6f9999dbb7e9444f91aecea74b9c09259da3e988493af7fb4f
|
||||
MISC ChangeLog 17546 RMD160 8ea99aa45412b71b654d7ffdc94daf0b30a26281 SHA1 13e858a20a5bd409e6f63ae9c9cea82ec13c9ef5 SHA256 08b91cf44b96eede30ff6d708e21b1a453e12bb98557295afe45597cdf319cd7
|
||||
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.18
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update to 2.2.20_rc1
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.19_2.2.20_rc1.patch"
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.20
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.21
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.22
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# dispatch conf execute
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.22-dispatch_conf.patch"
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-install-2.2.22
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# dispatch conf execute
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.22-dispatch_conf.patch"
|
||||
# support kernel 3
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.22-kernel_3.patch"
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-install-2.2.22
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# support kernel 3 and dispatch conf
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.22-r3.patch"
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.15-r5
|
||||
~sys-apps/calculate-install-2.2.22
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-install-2.2.23
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.23-r1.patch"
|
||||
}
|
||||
@ -1,31 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-install-2.2.23
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.23-r2.patch"
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
# Copyright 1999-2011 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 builder tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-install-2.2.23
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
diff --git data/calculate-builder data/calculate-builder
|
||||
index 969d725..944ecb7 100644
|
||||
--- data/calculate-builder
|
||||
+++ data/calculate-builder
|
||||
@@ -11,6 +11,13 @@ KERNEL_VERSION_CONF="modules_${KERNEL_VERSION_CONF//-/_}"
|
||||
MODULES_PATH="/lib/modules/${KERNEL_VERSION}"
|
||||
CONF_FILE="/etc/conf.d/modules"
|
||||
|
||||
+variable_value()
|
||||
+{
|
||||
+ local varname=$1
|
||||
+ cl-install -v --filter $varname |
|
||||
+ awk "{ if (\$1 == \"$varname\") print \$3 }"
|
||||
+}
|
||||
+
|
||||
get_cpufreq_modules(){
|
||||
MODULES_STRING=""
|
||||
for path in $(find $MODULES_PATH -name cpufreq)
|
||||
@@ -42,11 +49,15 @@ find_string_modules(){
|
||||
}
|
||||
|
||||
add_autoload_modules(){
|
||||
+ local roottype=`variable_value os_root_type`
|
||||
if ! find_string_modules;
|
||||
then
|
||||
ebegin "Added rules for cpu frequency"
|
||||
get_cpufreq_modules
|
||||
- echo ${KERNEL_VERSION_CONF}=\"${MODULES_STRING}\" >> ${CONF_FILE}
|
||||
+ if [[ $roottype == "hdd" ]]
|
||||
+ then
|
||||
+ echo ${KERNEL_VERSION_CONF}=\"${MODULES_STRING}\" >> ${CONF_FILE}
|
||||
+ fi
|
||||
else
|
||||
ebegin "Cpu frequency modules already detected"
|
||||
fi
|
||||
@@ -58,7 +69,8 @@ start() {
|
||||
}
|
||||
|
||||
stop() {
|
||||
- if rc-update show boot | grep -q calculate-builder
|
||||
+ local roottype=`variable_value os_root_type`
|
||||
+ if [[ $roottype == "hdd" ]] && rc-config list boot | grep -q calculate-builder
|
||||
then
|
||||
rc-update del calculate-builder boot
|
||||
fi
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 4778308..dec6ac5 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -656,6 +656,11 @@ class cl_builder(color_print):
|
||||
self.printERROR(_("System building failed"))
|
||||
return False
|
||||
self.printSUCCESS(_("System has built successfully"))
|
||||
+ if self.assembleIso:
|
||||
+ self.printWARNING(_("If you want emerge packages manually in "
|
||||
+ "assembling system, please perform:"))
|
||||
+ self.printWARNING(" cl-make -p %s -T"%
|
||||
+ self.clVars.Get('os_builder_profile'))
|
||||
return True
|
||||
|
||||
def restoreMount(self):
|
||||
@ -1,32 +0,0 @@
|
||||
commit fa71ec0c90364e924a887f93a7998a385f0c6bc5
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Mon Aug 29 11:10:47 2011 +0400
|
||||
|
||||
Add execute dispatch conf before iso pack.
|
||||
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 572e6c7..0e2d119 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -231,6 +231,13 @@ class cl_builder(color_print):
|
||||
removeKernelSources)
|
||||
self.printByResult(True)
|
||||
|
||||
+ def dispatchConf(self, distrPath):
|
||||
+ """Execute dispatch conf for """
|
||||
+ self.printMessageForTest(_("Execute '%s'")%"dispatch-conf")
|
||||
+ # run dispatch conf interactive
|
||||
+ os.system("chroot %s /bin/bash -c '/usr/sbin/dispatch-conf'"%
|
||||
+ distrPath)
|
||||
+
|
||||
def prepareSourceDistributive(self,distr):
|
||||
"""Unmount all bind,proc mount points from source distribute"""
|
||||
mp = self.clVars.Get('cl_builder_path')
|
||||
@@ -243,6 +250,7 @@ class cl_builder(color_print):
|
||||
self.printByResult(True)
|
||||
distrPath = distr.convertToDirectory().getDirectory()
|
||||
self.cleanNeedlessKernelData(distrPath)
|
||||
+ self.dispatchConf(distrPath)
|
||||
|
||||
if self.assembleIso and \
|
||||
self.clVars.Get('os_builder_profile').endswith('binary'):
|
||||
@ -1,25 +0,0 @@
|
||||
commit f7c6a747a1a2a54b34725ce5bb1c577b24a365ef
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue Aug 30 09:34:54 2011 +0400
|
||||
|
||||
Add support 3.0 kernel compiling.
|
||||
|
||||
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
|
||||
index 2b4d512..5835c08 100644
|
||||
--- pym/cl_fill_builder.py
|
||||
+++ pym/cl_fill_builder.py
|
||||
@@ -110,7 +110,13 @@ class fillVars(object, varsShare):
|
||||
kernelDirs = self.Get('cl_kernel_config_path')
|
||||
if not access(kernelDirs,R_OK):
|
||||
return ""
|
||||
- shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
+ # check first number (3 or other kernel)
|
||||
+ tupleKernelVer = self.Get('cl_kernel_ver').split('.')
|
||||
+ if tupleKernelVer and tupleKernelVer[0] == '3':
|
||||
+ shortVerSearch = re.search("^\d+\.\d+",
|
||||
+ self.Get('cl_kernel_ver'),re.I)
|
||||
+ else:
|
||||
+ shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
if shortVerSearch:
|
||||
shortVer = shortVerSearch.group()
|
||||
else:
|
||||
@ -1,112 +0,0 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 572e6c7..b6e3582 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -231,6 +231,13 @@ class cl_builder(color_print):
|
||||
removeKernelSources)
|
||||
self.printByResult(True)
|
||||
|
||||
+ def dispatchConf(self, distrPath):
|
||||
+ """Execute dispatch conf for """
|
||||
+ self.printMessageForTest(_("Execute '%s'")%"dispatch-conf")
|
||||
+ # run dispatch conf interactive
|
||||
+ os.system("chroot %s /bin/bash -c '/usr/sbin/dispatch-conf'"%
|
||||
+ distrPath)
|
||||
+
|
||||
def prepareSourceDistributive(self,distr):
|
||||
"""Unmount all bind,proc mount points from source distribute"""
|
||||
mp = self.clVars.Get('cl_builder_path')
|
||||
@@ -243,6 +250,7 @@ class cl_builder(color_print):
|
||||
self.printByResult(True)
|
||||
distrPath = distr.convertToDirectory().getDirectory()
|
||||
self.cleanNeedlessKernelData(distrPath)
|
||||
+ self.dispatchConf(distrPath)
|
||||
|
||||
if self.assembleIso and \
|
||||
self.clVars.Get('os_builder_profile').endswith('binary'):
|
||||
@@ -580,13 +588,6 @@ class cl_builder(color_print):
|
||||
dialogRes = dialogYesNo(dialogMessage)
|
||||
if dialogRes in (None,False):
|
||||
return True
|
||||
- self.printMessageForTest(_("Prepare data for live image"))
|
||||
- self.prepareSourceDistributive(self.sourceDistr)
|
||||
- self.printByResult(True)
|
||||
- self.targetDistr.prepareIso = self.flashPrepacking
|
||||
- self.printMessageForTest(_("Creating squash image"))
|
||||
- self.targetDistr.installFrom(self.sourceDistr)
|
||||
- self.printByResult(True)
|
||||
|
||||
self.printMessageForTest(_("Removing old images"))
|
||||
oldImages = map(lambda x:pathJoin(buildDirectory,x),
|
||||
@@ -597,6 +598,14 @@ class cl_builder(color_print):
|
||||
raise BuilderError(_("Can not remove old files")+":\n%s"%str(e))
|
||||
self.printByResult(True)
|
||||
|
||||
+ self.printMessageForTest(_("Prepare data for live image"))
|
||||
+ self.prepareSourceDistributive(self.sourceDistr)
|
||||
+ self.printByResult(True)
|
||||
+ self.targetDistr.prepareIso = self.flashPrepacking
|
||||
+ self.printMessageForTest(_("Creating squash image"))
|
||||
+ self.targetDistr.installFrom(self.sourceDistr)
|
||||
+ self.printByResult(True)
|
||||
+
|
||||
self.printMessageForTest(_("Performing syncronization"))
|
||||
processSync = process("/bin/sync")
|
||||
self.printByResult(processSync.success())
|
||||
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
|
||||
index 2b4d512..6f20032 100644
|
||||
--- pym/cl_fill_builder.py
|
||||
+++ pym/cl_fill_builder.py
|
||||
@@ -23,7 +23,7 @@ from os import access, R_OK,W_OK
|
||||
from os import path
|
||||
from cl_distr import Distributive
|
||||
from cl_utils import getTupleVersion,genpassword,pathJoin,_toUNICODE, \
|
||||
- getFilesCount
|
||||
+ getFilesCount,getCmdLineParam
|
||||
from operator import itemgetter
|
||||
from types import ListType
|
||||
from cl_datavars import iniParser
|
||||
@@ -110,7 +110,13 @@ class fillVars(object, varsShare):
|
||||
kernelDirs = self.Get('cl_kernel_config_path')
|
||||
if not access(kernelDirs,R_OK):
|
||||
return ""
|
||||
- shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
+ # check first number (3 or other kernel)
|
||||
+ tupleKernelVer = self.Get('cl_kernel_ver').split('.')
|
||||
+ if tupleKernelVer and tupleKernelVer[0] == '3':
|
||||
+ shortVerSearch = re.search("^\d+\.\d+",
|
||||
+ self.Get('cl_kernel_ver'),re.I)
|
||||
+ else:
|
||||
+ shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
|
||||
if shortVerSearch:
|
||||
shortVer = shortVerSearch.group()
|
||||
else:
|
||||
@@ -309,21 +315,18 @@ class fillVars(object, varsShare):
|
||||
squashfiles = filter(lambda x:x,
|
||||
map(Distributive.reLive.search,
|
||||
os.listdir(directory)))
|
||||
+ curName = self.Get('cl_builder_current_squash')
|
||||
if squashfiles:
|
||||
- return map(lambda x:x.group(),
|
||||
- sorted(squashfiles, key=self.getSquashNum))[:-1]
|
||||
+ return filter(lambda x:x != curName,
|
||||
+ map(lambda x:x.group(),
|
||||
+ sorted(squashfiles, key=self.getSquashNum)))
|
||||
return ""
|
||||
|
||||
def get_cl_builder_current_squash(self):
|
||||
"""Livecd.squashfs name (may be livecd.squashfs.2 and etc)"""
|
||||
- directory = self.Get('cl_builder_iso_path')
|
||||
- if not os.access(directory,R_OK):
|
||||
- return ""
|
||||
- squashfiles = filter(lambda x:x,
|
||||
- map(Distributive.reLive.search,
|
||||
- os.listdir(directory)))
|
||||
- if squashfiles:
|
||||
- return max(squashfiles, key=self.getSquashNum).group()
|
||||
+ loopValue = getCmdLineParam('loop')
|
||||
+ if loopValue:
|
||||
+ return path.basename(loopValue)
|
||||
return ""
|
||||
|
||||
def get_cl_builder_iso_path(self):
|
||||
@ -1,52 +0,0 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 0fc4d6e..ad792c3 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -786,3 +786,12 @@ class cl_builder(color_print):
|
||||
self.printERROR(_("'{0}' is not supported by {1}")\
|
||||
.format(compress,"squashfs"))
|
||||
return False
|
||||
+
|
||||
+ def setLive(self,live):
|
||||
+ """Set variable for activate patch init.d/calculate:
|
||||
+
|
||||
+ discard --live from cl-install --startup"""
|
||||
+ if live:
|
||||
+ self.clVars.Set('cl_builder_live_set',"on",True)
|
||||
+ else:
|
||||
+ self.clVars.Set('cl_builder_live_set',"off",True)
|
||||
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
|
||||
index c7d7332..98692a4 100644
|
||||
--- pym/cl_image_cmd.py
|
||||
+++ pym/cl_image_cmd.py
|
||||
@@ -58,6 +58,9 @@ CMD_OPTIONS = [{'shortOption':"p",
|
||||
{'longOption':'notree',
|
||||
'help':_("exclude portage tree from image")
|
||||
},
|
||||
+ {'longOption':'live',
|
||||
+ 'help':_("use only live templates on startup")
|
||||
+ },
|
||||
{'longOption':'noisohybrid',
|
||||
'help':_("create iso image without isohybrid")
|
||||
},
|
||||
@@ -146,6 +149,8 @@ class image_cmd(share_cmd):
|
||||
if not self.logicObj.setCompression(values.compress):
|
||||
sys.exit(1)
|
||||
|
||||
+ self.logicObj.setLive(values.live)
|
||||
+
|
||||
if not self.isScratch(False) \
|
||||
and self.logicObj.clVars.Get('cl_builder_distro'):
|
||||
if not self.logicObj.setAssembleData(values.p,values.v):
|
||||
diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
|
||||
index d4e621c..93bb908 100644
|
||||
--- pym/cl_vars_builder.py
|
||||
+++ pym/cl_vars_builder.py
|
||||
@@ -153,6 +153,7 @@ class Data:
|
||||
# path which contains images
|
||||
cl_builder_image_path = {}
|
||||
|
||||
+ cl_builder_live_set = {}
|
||||
# lib vars
|
||||
cl_chroot_path = {}
|
||||
cl_env_path = {}
|
||||
@ -1,53 +0,0 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 0fc4d6e..ad792c3 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -786,3 +786,12 @@ class cl_builder(color_print):
|
||||
self.printERROR(_("'{0}' is not supported by {1}")\
|
||||
.format(compress,"squashfs"))
|
||||
return False
|
||||
+
|
||||
+ def setLive(self,live):
|
||||
+ """Set variable for activate patch init.d/calculate:
|
||||
+
|
||||
+ discard --live from cl-install --startup"""
|
||||
+ if live:
|
||||
+ self.clVars.Set('cl_builder_live_set',"on",True)
|
||||
+ else:
|
||||
+ self.clVars.Set('cl_builder_live_set',"off",True)
|
||||
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
|
||||
index c7d7332..8a35528 100644
|
||||
--- pym/cl_image_cmd.py
|
||||
+++ pym/cl_image_cmd.py
|
||||
@@ -58,6 +58,9 @@ CMD_OPTIONS = [{'shortOption':"p",
|
||||
{'longOption':'notree',
|
||||
'help':_("exclude portage tree from image")
|
||||
},
|
||||
+ {'longOption':'live',
|
||||
+ 'help':_("use only live templates on startup")
|
||||
+ },
|
||||
{'longOption':'noisohybrid',
|
||||
'help':_("create iso image without isohybrid")
|
||||
},
|
||||
@@ -146,6 +149,9 @@ class image_cmd(share_cmd):
|
||||
if not self.logicObj.setCompression(values.compress):
|
||||
sys.exit(1)
|
||||
|
||||
+ if values.live:
|
||||
+ self.logicObj.setLive(values.live)
|
||||
+
|
||||
if not self.isScratch(False) \
|
||||
and self.logicObj.clVars.Get('cl_builder_distro'):
|
||||
if not self.logicObj.setAssembleData(values.p,values.v):
|
||||
diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
|
||||
index d4e621c..bd5595e 100644
|
||||
--- pym/cl_vars_builder.py
|
||||
+++ pym/cl_vars_builder.py
|
||||
@@ -153,6 +153,7 @@ class Data:
|
||||
# path which contains images
|
||||
cl_builder_image_path = {}
|
||||
|
||||
+ cl_builder_live_set = {'value':'off'}
|
||||
# lib vars
|
||||
cl_chroot_path = {}
|
||||
cl_env_path = {}
|
||||
@ -1,21 +1,5 @@
|
||||
AUX calculate-client-2.2.23-r1.patch 2886 RMD160 99cb8f4bed5e34da1686ad4e718d3c60644433fa SHA1 699aea622d3928d43aa6b455f8cc956750235724 SHA256 c91df84b5288deafeff69612d8f5def070003004741824392e4126061ff1f3cf
|
||||
AUX calculate-client-2.2.23-r2.patch 3401 RMD160 a4ffc87ff1e5cafa540e6a95ff4dd0bb3e21839a SHA1 143f2cbad749a330f7209a5616ca409280c1bdea SHA256 5cb5c0185ff8255d5aec8f3797008e3b3ea4c03fde8c9eb7ffc602b035c3c420
|
||||
DIST calculate-client-2.2.18.tar.bz2 37446 RMD160 adeb047706ac3eb760a1128f6a8a7ae1b845f008 SHA1 d72cbea968bf054aa125e5bf367edf4c9e599178 SHA256 d741541dc3c3e7f7540f08e243dbe8b17369d019bb45dacf93ab3d81aba4b749
|
||||
DIST calculate-client-2.2.19.tar.bz2 31456 RMD160 10e0cf7d0a2c62ce56474f64249afd58d459a629 SHA1 64d4b53f8867c44e27ba2dd7a05d7a9573b6dae8 SHA256 07136f3343f874582e6bc901a4ef17b46b61ca3a1390fdee800b99d2fb1d3e8c
|
||||
DIST calculate-client-2.2.20.tar.bz2 31442 RMD160 fa437088326986cc32b02607f9fb33577678903c SHA1 8df857e255fd2c858eadc0dd19cb39664453e295 SHA256 c7c526a5b9666cfffba8b94af13c97feb7287df67a8c6d7c7b7f24e4232b7445
|
||||
DIST calculate-client-2.2.21.tar.bz2 31502 RMD160 a9ba028c56b2e5dfb3b006dde7ecf57c4be9836d SHA1 cc7d395f35a393d76f904c2f109a8c40503c0c30 SHA256 5598c5d145b8fa7f86438905cdfdcf30e202c0b079a290dc4cc2a8ed7f8d83e8
|
||||
DIST calculate-client-2.2.22.tar.bz2 31519 RMD160 4f3fa63d20efd571fd1cb284d306f571b0d00263 SHA1 87c64dba45854019144f4c36669e0e761dd60c4b SHA256 36d5679c044c7219213de6791461e3452e61809edfbc71672856fe29c1fce5f7
|
||||
DIST calculate-client-2.2.23.tar.bz2 31478 RMD160 f258fdeac33dfffefd33d95954a0330509dfdf15 SHA1 d18bd1b4cfe56175530a96c8bc29c2a7c67f68ab SHA256 7e9f58897935b18a0e162a43db61f898091ee2087ff8a392183131d0b315bed5
|
||||
DIST calculate-client-2.2.24.tar.bz2 31457 RMD160 c946e6a1fb27b420149ba3aa0e31ee28b2a02014 SHA1 de98f67bc3d10ad8c9b870961458cbd24e510ee1 SHA256 19a1eb817782d52a168d93a47bba86d03fbc1d3a9bea16e3ea6e8e18f765e056
|
||||
EBUILD calculate-client-2.2.18.ebuild 1685 RMD160 0914a029f468329ad9d3599676e8d2358a1812a2 SHA1 a06f36695025ee413fa3781b67ebc951974dd29b SHA256 5e89ef0e05c3c96f39f6f8917a7413226d4967e8d35938cb2d35be1f5bf9fc47
|
||||
EBUILD calculate-client-2.2.19.ebuild 1685 RMD160 ed31d82c683677be0db5061348578770156cc52b SHA1 ac7e2896c35f73cbda51117bbf9a652d87905ccd SHA256 28694a73560de0f19af683db45b20d5c63b1f7341462d6b772eafdecd7c445a9
|
||||
EBUILD calculate-client-2.2.20.ebuild 1685 RMD160 ac88f805b2038fd3034f7f76b42500606b3b9db0 SHA1 650b82e4561d56ef65edbdd99f35c116a34fe866 SHA256 a971399e8aa0ec62df80fb36c2d1cde94348a0b27938e91c7282afd02a0a3507
|
||||
EBUILD calculate-client-2.2.21.ebuild 857 RMD160 dd68f6706df67a990322ecadd8e4a7250e6b64f5 SHA1 125ed3e529c2bd59f6226fcae7e6a872cd403c4a SHA256 0da6b128cea3c217f2157f29009098812af4b32500b63cdfa244f2cba7a8dbf8
|
||||
EBUILD calculate-client-2.2.22.ebuild 857 RMD160 8745d48140be3a67cf2d2b2e17a4ec0508f082ef SHA1 14c097dda3b784fbd25a7402bdc74307e69a7342 SHA256 bac704b80df34c2ecc05f4afb470e814c854e04ed65201fc1afdc9a5d5a46bba
|
||||
EBUILD calculate-client-2.2.23-r1.ebuild 974 RMD160 bf182f82ef2c45982cbfd252e420d0e1900f6d8f SHA1 5a74662e64809de483dccb93bece3a3403b2834c SHA256 32fe77d6224948cca93e66c7031f8e2dd2d751f5a57a62f5abb8609fbc45487e
|
||||
EBUILD calculate-client-2.2.23-r2.ebuild 1009 RMD160 25fcc0d805b8063d7b2ec7f718b802d911f05aa0 SHA1 8990a3e815cfb3ca7d4d32eeffc35b5cbbff98c3 SHA256 6d549c5b4e6e8890adc59a6f57fe2297f71f3712b691e8fa3ae017af5a0f1f43
|
||||
EBUILD calculate-client-2.2.23.ebuild 857 RMD160 3a110d6faf226c5d663a2a088c8b320e255fc51b SHA1 5b78b1221ffeb66d35e39f6ce4177b8f83f1464e SHA256 3016796eaf8ad40125c3811334c2be013be0f2ddf4a2e59029554de89a32f692
|
||||
EBUILD calculate-client-2.2.24.ebuild 857 RMD160 20cd53346f0db753b78d72f4fbf28b7a44b1fad6 SHA1 32f9a70ea31fa00dc476944fe159bf841278025c SHA256 18ca2f2c38cea3499b69c06810fc0b9d9e616e5dbbcc6f05aeb30e1712b25156
|
||||
EBUILD calculate-client-2.2.9999.ebuild 1623 RMD160 1b81a8a2088dba8bcb439a8c3ecdf1ebfe5656e6 SHA1 bfe1bc648163eab9a638d0be4974157a72ff237c SHA256 7680e14e7e79844248bbf9c45701543b219cd0c71d72cf4d7dcd6f3e571d8402
|
||||
MISC ChangeLog 19832 RMD160 c6f40d81627de84b72ae572416b76ae0def8bd22 SHA1 2811b4576b0d20555d9764331d99bd464387c739 SHA256 40b8af81e9ec6d54e354f1dc868131f814bfa4c7f2ec282fba5568c4db7d1b43
|
||||
MISC ChangeLog 20270 RMD160 4a3c4f4b8c465fee745858cb1f7680184a0cdf1c SHA1 178ddda040b8c33bafdc64b202ddb94d042574de SHA256 e685b4b22d97ea04e77461cae54084f36a119b3321494bee17f0c5500a2a06b4
|
||||
MISC metadata.xml 310 RMD160 ed986dbc43c958bd57e0fb73749ee09167ee0221 SHA1 4007f716df1aa85ec65d926f246663effc382384 SHA256 5023605d36dcbb5d5fe1b1ac54f7125a4087479b5168601075a8050ed51c38c2
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.18
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
ISUPDATE=/tmp/${PN}.ebuild.update
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
|
||||
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
|
||||
|
||||
pkg_preinst() {
|
||||
touch ${ISUPDATE}
|
||||
rm -f /etc/init.d/client
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
mkdir -p ${OLDISUPDATEPATH}
|
||||
touch ${OLDISUPDATE}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/install
|
||||
rm ${ISUPDATE}
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
|
||||
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
|
||||
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
|
||||
then
|
||||
:
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
|
||||
fi
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.19
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
ISUPDATE=/tmp/${PN}.ebuild.update
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
|
||||
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
|
||||
|
||||
pkg_preinst() {
|
||||
touch ${ISUPDATE}
|
||||
rm -f /etc/init.d/client
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
mkdir -p ${OLDISUPDATEPATH}
|
||||
touch ${OLDISUPDATE}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/install
|
||||
rm ${ISUPDATE}
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
|
||||
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
|
||||
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
|
||||
then
|
||||
:
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
|
||||
fi
|
||||
}
|
||||
@ -1,64 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.20
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
ISUPDATE=/tmp/${PN}.ebuild.update
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
OLDISUPDATEPATH="${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17/temp/"
|
||||
OLDISUPDATE="${OLDISUPDATEPATH}/${PN}.update"
|
||||
|
||||
pkg_preinst() {
|
||||
touch ${ISUPDATE}
|
||||
rm -f /etc/init.d/client
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
mkdir -p ${OLDISUPDATEPATH}
|
||||
touch ${OLDISUPDATE}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/install
|
||||
rm ${ISUPDATE}
|
||||
|
||||
# for fixing bug of ebuild calculate-client-2.0.17
|
||||
rm -rf ${PORTAGE_TMPDIR}/portage/${CATEGORY}/${PN}-2.0.17
|
||||
rmdir ${PORTAGE_TMPDIR}/portage/${CATEGORY} &>/dev/null
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
|
||||
pkg_prerm() {
|
||||
# for fixing bug of ebuild calculate-client-2.0.17 (|| -e ${OLDISUPDATE} )
|
||||
if ! [[ -e ${ISUPDATE} || -e ${OLDISUPDATE} ]];
|
||||
then
|
||||
:
|
||||
#/usr/lib/calculate-2.2/calculate-client/bin/uninstall
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.21
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.22
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Fix translate
|
||||
epatch "${FILESDIR}/calculate-client-2.2.23-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Fix translate, discard remove private user files
|
||||
epatch "${FILESDIR}/calculate-client-2.2.23-r2.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-client perform:"
|
||||
einfo " cl-client --install"
|
||||
}
|
||||
@ -1,65 +0,0 @@
|
||||
diff --git pym/cl_client.py pym/cl_client.py
|
||||
index 66b2ac0..97486bc 100644
|
||||
--- pym/cl_client.py
|
||||
+++ pym/cl_client.py
|
||||
@@ -1980,8 +1980,8 @@ class client(share, commandServer, encrypt):
|
||||
if remoteHost:
|
||||
self.printERROR(_("The computer is already in the domain %s")\
|
||||
%remoteHost)
|
||||
- self.printWARNING(_("Before joining the domain, \
|
||||
-you need to remove it from the previous domain"))
|
||||
+ self.printWARNING(_("Before joining the domain, "
|
||||
+ "you need to remove it from the previous domain"))
|
||||
self.printWARNING(_("Run 'cl-client -r'"))
|
||||
return False
|
||||
|
||||
@@ -2324,7 +2324,7 @@ you need to remove it from the previous domain"))
|
||||
return False
|
||||
self.printOK(_("Changed password of user %s")%os.environ["USER"] + \
|
||||
" ...")
|
||||
- self.printWARNING(_("Password will be changed when you logout from the \
|
||||
-X session"))
|
||||
+ self.printWARNING(_("Password will be changed when you logout from the"
|
||||
+ " X session"))
|
||||
return True
|
||||
|
||||
diff --git pym/cl_client_cmd.py pym/cl_client_cmd.py
|
||||
index f7375a5..fdf510a 100644
|
||||
--- pym/cl_client_cmd.py
|
||||
+++ pym/cl_client_cmd.py
|
||||
@@ -26,8 +26,8 @@ lang().setLanguage(sys.modules[__name__])
|
||||
USAGE = _("%prog [options] domain")
|
||||
|
||||
# Коментарии к использованию программы
|
||||
-COMMENT_EXAMPLES = _("Adds settings for connecting to domain \
|
||||
-server.calculate.ru")
|
||||
+COMMENT_EXAMPLES = _("Adds settings for connecting to domain "
|
||||
+ "server.calculate.ru")
|
||||
|
||||
# Пример использования программы
|
||||
EXAMPLES = _("%prog server.calculate.ru")
|
||||
diff --git pym/cl_sync_cmd.py pym/cl_sync_cmd.py
|
||||
index f96c331..53847f2 100644
|
||||
--- pym/cl_sync_cmd.py
|
||||
+++ pym/cl_sync_cmd.py
|
||||
@@ -36,14 +36,14 @@ DESCRIPTION = _("Mounting resources and synchronize the user profile")
|
||||
|
||||
# Опции командной строки
|
||||
CMD_OPTIONS = [{'longOption':"login",
|
||||
- 'help':_("mount user resource and synchronize the user \
|
||||
-profile")},
|
||||
+ 'help':_("mount user resource and synchronize the user "
|
||||
+ "profile")},
|
||||
{'longOption':"logout",
|
||||
- 'help':_("synchronize the user profile and umount user \
|
||||
-resource")},
|
||||
+ 'help':_("synchronize the user profile and umount user "
|
||||
+ "resource")},
|
||||
{'longOption':"nosync",
|
||||
- 'help':_("not synchronize the user preferences, is used \
|
||||
-in conjunction with the 'login' or 'logout'")},
|
||||
+ 'help':_("not synchronize the user preferences, is used "
|
||||
+ "in conjunction with the 'login' or 'logout'")},
|
||||
{'longOption':"set"},
|
||||
{'longOption':"progress",
|
||||
'help':_("show progress bar for xdm startup")}]
|
||||
@ -1,77 +0,0 @@
|
||||
diff --git pym/cl_client.py pym/cl_client.py
|
||||
index 66b2ac0..973f729 100644
|
||||
--- pym/cl_client.py
|
||||
+++ pym/cl_client.py
|
||||
@@ -344,9 +344,9 @@ class client(share, commandServer, encrypt):
|
||||
# объект конвертирования из старого remote env файла
|
||||
convObj = None
|
||||
# Приватный файлы пользователя
|
||||
- privateFiles = ['.kde4/share/apps/kwallet/kdewallet.kwl', configFileServer]
|
||||
+ privateFiles = [configFileServer]
|
||||
# Приватные директории пользователя
|
||||
- privateDirs = [".ssh"]
|
||||
+ privateDirs = []
|
||||
|
||||
|
||||
def removeVars(self):
|
||||
@@ -1980,8 +1980,8 @@ class client(share, commandServer, encrypt):
|
||||
if remoteHost:
|
||||
self.printERROR(_("The computer is already in the domain %s")\
|
||||
%remoteHost)
|
||||
- self.printWARNING(_("Before joining the domain, \
|
||||
-you need to remove it from the previous domain"))
|
||||
+ self.printWARNING(_("Before joining the domain, "
|
||||
+ "you need to remove it from the previous domain"))
|
||||
self.printWARNING(_("Run 'cl-client -r'"))
|
||||
return False
|
||||
|
||||
@@ -2324,7 +2324,7 @@ you need to remove it from the previous domain"))
|
||||
return False
|
||||
self.printOK(_("Changed password of user %s")%os.environ["USER"] + \
|
||||
" ...")
|
||||
- self.printWARNING(_("Password will be changed when you logout from the \
|
||||
-X session"))
|
||||
+ self.printWARNING(_("Password will be changed when you logout from the"
|
||||
+ " X session"))
|
||||
return True
|
||||
|
||||
diff --git pym/cl_client_cmd.py pym/cl_client_cmd.py
|
||||
index f7375a5..fdf510a 100644
|
||||
--- pym/cl_client_cmd.py
|
||||
+++ pym/cl_client_cmd.py
|
||||
@@ -26,8 +26,8 @@ lang().setLanguage(sys.modules[__name__])
|
||||
USAGE = _("%prog [options] domain")
|
||||
|
||||
# Коментарии к использованию программы
|
||||
-COMMENT_EXAMPLES = _("Adds settings for connecting to domain \
|
||||
-server.calculate.ru")
|
||||
+COMMENT_EXAMPLES = _("Adds settings for connecting to domain "
|
||||
+ "server.calculate.ru")
|
||||
|
||||
# Пример использования программы
|
||||
EXAMPLES = _("%prog server.calculate.ru")
|
||||
diff --git pym/cl_sync_cmd.py pym/cl_sync_cmd.py
|
||||
index f96c331..53847f2 100644
|
||||
--- pym/cl_sync_cmd.py
|
||||
+++ pym/cl_sync_cmd.py
|
||||
@@ -36,14 +36,14 @@ DESCRIPTION = _("Mounting resources and synchronize the user profile")
|
||||
|
||||
# Опции командной строки
|
||||
CMD_OPTIONS = [{'longOption':"login",
|
||||
- 'help':_("mount user resource and synchronize the user \
|
||||
-profile")},
|
||||
+ 'help':_("mount user resource and synchronize the user "
|
||||
+ "profile")},
|
||||
{'longOption':"logout",
|
||||
- 'help':_("synchronize the user profile and umount user \
|
||||
-resource")},
|
||||
+ 'help':_("synchronize the user profile and umount user "
|
||||
+ "resource")},
|
||||
{'longOption':"nosync",
|
||||
- 'help':_("not synchronize the user preferences, is used \
|
||||
-in conjunction with the 'login' or 'logout'")},
|
||||
+ 'help':_("not synchronize the user preferences, is used "
|
||||
+ "in conjunction with the 'login' or 'logout'")},
|
||||
{'longOption':"set"},
|
||||
{'longOption':"progress",
|
||||
'help':_("show progress bar for xdm startup")}]
|
||||
@ -1,21 +1,5 @@
|
||||
AUX calculate-desktop-2.2.23-r1.patch 3071 RMD160 758f17129be7eb0d973e4b9d38a791ccc292d055 SHA1 0501341f716de3c3b5c24d5578bb02f9705b619e SHA256 27f7ab6d69a1f386b6a9568e212601d14e363a1f8296eef3e43ba5a312700e07
|
||||
AUX calculate-desktop-2.2.23-r2.patch 2887 RMD160 5fd0f037e394a9f48d42fc126567722775893519 SHA1 2021438683d1122ca9891bd6aab1db52f40065c1 SHA256 4ca47d1051f31fc470e269ac3348c00402d79ed0cccb4608d48bfd9f74d41905
|
||||
DIST calculate-desktop-2.2.18.tar.bz2 16323 RMD160 b4d1809826406787cbd8d846efec9044795acb0c SHA1 d445f9f7b0f0ef52e5a5d6064fb4841d122640b1 SHA256 1096bf06f5b24d1bdd12cd348b54739c251864803b0688c2d786099c13f45293
|
||||
DIST calculate-desktop-2.2.19.tar.bz2 14418 RMD160 c7b193470679659cc492f5a08adfb7b334ede17c SHA1 453b2e7c651380ed1a9cb9ca7d44bc1a8c1fb3fd SHA256 3c84522bfbe0a82f0a8a16e7af8943c1098702780499b5cca899c1b4ac6dfb0f
|
||||
DIST calculate-desktop-2.2.20.tar.bz2 14400 RMD160 028f2bdc7cdeb7941dcf0c0b023a28dea89d52be SHA1 ec1060292fb5d142ed8cb947a63d64cfb2e12fb6 SHA256 e30c58e43ca80a45bb45817caf3ff3ff015157d579a22876a9256346b730995d
|
||||
DIST calculate-desktop-2.2.21.tar.bz2 14878 RMD160 c4b2915a72237f8b47e8e9a4e667f74c1138dd5f SHA1 7fb703b43da20be27cb4a2e610b9fce1d722d04c SHA256 70d32938198bfb570003688374081579fca7405ed64fc67ea138b2cf846d0d8a
|
||||
DIST calculate-desktop-2.2.22.tar.bz2 14858 RMD160 8d4723101ddd2e424af797a348e946d8e765cf35 SHA1 8b588220470ecbfbc9d18fd4a3ea4003e2758a00 SHA256 e55d643c22ee607a7a4bc55344762321de3c633a26c304eb05aea097071ac372
|
||||
DIST calculate-desktop-2.2.23.tar.bz2 14864 RMD160 b614bac1dbecef500818c8d7268a917bf88f7d22 SHA1 7301b8910f808d4748a15d03a6c6456c8de6ff0b SHA256 ddd40045afe1a9f9dd322f9288574e327192e7ae82428b1123be78a113c357fc
|
||||
DIST calculate-desktop-2.2.24.tar.bz2 15024 RMD160 fc11b4acc070de36fc3ddf9886da9d6157422dbe SHA1 b449ee1f49b90fc349296dfd48bed1b1bfbeb2a2 SHA256 92c67c60563dddded6da7d62dda777bbd4e008a9fa081236001f13c29b31b003
|
||||
EBUILD calculate-desktop-2.2.18.ebuild 875 RMD160 1d4b06da7fc339b6a48413ac086ea6e0ade08984 SHA1 b0714073b31fc408a19c7e4e03389c867592beec SHA256 9fcd74674a9176ed3a96253b21a39849a771d0841c0c03832c97d61c6e4cbadf
|
||||
EBUILD calculate-desktop-2.2.19.ebuild 875 RMD160 3749fae7718ba31c935c1bebcd8ac5d45225db07 SHA1 6db6e9b83a7c765850dc355783468828a9a0b1f0 SHA256 a0107aeed68983ef723b06cbd39dbbd134d39fd9fb707fa5fa53e332da8db04d
|
||||
EBUILD calculate-desktop-2.2.20.ebuild 875 RMD160 1e93591bfcf553488bacf03e60215068cc1952d3 SHA1 d2601e566b53b495ef795ce42d5979b1f3edb11b SHA256 bae73e11f4cf8285072345fcd102d80bdac0eaa8c7871c5fa3c6b28923caf89b
|
||||
EBUILD calculate-desktop-2.2.21.ebuild 875 RMD160 9e3d031ce1518b65a782422635e1628f20a47dca SHA1 419eea4d14dc0410810feb6251d2ec6f56176c33 SHA256 b6cbf4868683fbe551633100a6804b0f6de9cf7a075d822accfa6eaaae8b34bd
|
||||
EBUILD calculate-desktop-2.2.22.ebuild 875 RMD160 d1108ef5b23ad47b2b077b536479d5b31f6775f9 SHA1 da9727835d980376ce9f0212b5b4de603501ffb3 SHA256 e8cbfbce534da37f82d3d48278edfbd8aaa8d479181a7729d08f6f2aeb2ea761
|
||||
EBUILD calculate-desktop-2.2.23-r1.ebuild 993 RMD160 dac0c902750d4a14fb7322737bf2dd71ecc400d2 SHA1 ca79155cc201a2519e220850b8b1bb8ad6a9b933 SHA256 3d2521724365379b9af23589cb427901203bc17d1bf2d09311955bbc3e7f6f38
|
||||
EBUILD calculate-desktop-2.2.23-r2.ebuild 993 RMD160 8a72de85133d8353cfbcc51832ff496222a91ba3 SHA1 567fcb13902fd98f1e7dc33a9ebea96410f6d23e SHA256 bd61ccfec75b4c0f952fae9cef2e4812984ca7ab2b7c5dc13298f56e6def6f1c
|
||||
EBUILD calculate-desktop-2.2.23.ebuild 875 RMD160 62ce3696958f1c3a68d3f92460c5308a3bdd6752 SHA1 8063bd4cf9df1d2d8b9f8516b2c052673434bfab SHA256 41c28ba79731cf2ac7313e6dfc30dcb1f820eb65b7354898ceb94bfade41fe16
|
||||
EBUILD calculate-desktop-2.2.24.ebuild 875 RMD160 7c55bc31eb2ff1c66b520056959ee2e907ac6660 SHA1 4f5fe5d78e66b9b0b73a92dfe368d874238b3237 SHA256 d71248dd870c930de0d3e035130c0fff9bff9b8defbe63c2048f86e5f447cf9e
|
||||
EBUILD calculate-desktop-2.2.9999.ebuild 887 RMD160 1dc176568da935318117adcaa7747c2b2924eaab SHA1 c418e1a3b55d04b9f00939259e1231095285eeb1 SHA256 8824762b98472f9b6263c1d85b1f159aea6d7694dee7c93b336eae061afb77d3
|
||||
MISC ChangeLog 14519 RMD160 6d84fd85b6e852dbe1c450a2be24bd0dfd00fa72 SHA1 815b4729d671c1edb346aff9a3c5d3d2b24b63aa SHA256 45ebb805da2184533db6c64c1ae1cb6fff6b51b9c732d59917519feeea70cd95
|
||||
MISC ChangeLog 14967 RMD160 12f41b042ee2b03ebbcef1cef7981b5928d2e923 SHA1 0c7af5a06f508bebc112956087d276094bfa2310 SHA256 81729d119b92230b7377a37e315dc54092e3759b33437584b123ffbaa827c895
|
||||
MISC metadata.xml 315 RMD160 36a1a8d03aed0a483def83e076f484a64d452a8b SHA1 f6e70641eab777d2417d8a7600e8d3f09f53f96f SHA256 67fea0b1af7d10c0f86e72ab40f527e99c6f81f7aace4716344bdfb97c769a18
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.18
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.19
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.20
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.21
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.22
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add --verbose
|
||||
epatch "${FILESDIR}/calculate-desktop-2.2.23-r1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add --verbose
|
||||
epatch "${FILESDIR}/calculate-desktop-2.2.23-r2.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
# Copyright 1999-2011 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 program of the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="kde xfce gnome"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.23
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
xfce? ( x11-misc/xdialog )
|
||||
gnome? ( x11-misc/xdialog )
|
||||
kde? ( kde-base/kdialog )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_postinst() {
|
||||
#${EROOT}/usr/lib/calculate-2.2/calculate-desktop/bin/install
|
||||
einfo "For configure calculate-desktop perform:"
|
||||
einfo " cl-desktop --install"
|
||||
if use kde || use xfce || use gnome
|
||||
then
|
||||
einfo " /etc/init.d/xdm restart"
|
||||
fi
|
||||
}
|
||||
@ -1,37 +1,5 @@
|
||||
AUX calculate-i18n-2.2.19_2.2.20_rc1.patch 2295 RMD160 8ba75a7c96bab8e8dd4d239a871a116235eff41f SHA1 0f39b63f327b47fbe7eec3cf6825445f9984cc50 SHA256 dddb70d0f1d953b08d90cd0ae4e36bb115760d92e0474eced16be1007fb43f21
|
||||
AUX calculate-i18n-2.2.19_lvmraid_rc1.patch 6856 RMD160 617266d25c707bd4e5fe86ffe4270054db5a51ba SHA1 e5c5b113119fcde735391f453bb14cd14110ab29 SHA256 eb9d34e460832f4be4897ade54ba16c5a25b6d91b606f8b5c3e4d6810bd73eb9
|
||||
AUX calculate-i18n-2.2.19_lvmraid_rc2.patch 7313 RMD160 2bd1e142f77f704f63825ae0a6eac9d66785f563 SHA1 96d1162db32711406b4429600f5b1efcfa1181a1 SHA256 f3e6b3878384eb9807e2c6518c891f0d034fe4ddbc8faffa3c2914774d0799a5
|
||||
AUX calculate-i18n-2.2.20-btrfs.patch 797 RMD160 7979e726cc50369f2242c8c8ca089fa5137ef4c6 SHA1 ad18bc8ab09bc932a9e6ebf0b849887267edb3f1 SHA256 7b2c3d5c0c1a0a8bee67c182dd00a86aa7e14becfc4429b49349d5075755b0ba
|
||||
AUX calculate-i18n-2.2.20-for_assemble.patch 995 RMD160 ee251a5d04a2b7c4a1f54d461aff7c97658f3a96 SHA1 cfb77845fef84873cd4a2895aff706397a46fec9 SHA256 faf17b5e3e72f9d94ed363b6a935be62a086c5b9a4bf4b804cc00a003b08c89b
|
||||
AUX calculate-i18n-2.2.20-r2.patch 790 RMD160 14bdc03c42582f34af58a1311f9c92c888911183 SHA1 619db7605250073395e82ea5a24d1e12fa6f5bca SHA256 22066aaf7c62bfe089ae8be933ec73a4faec88086ac6578b9eb77cdb2f481bd1
|
||||
AUX calculate-i18n-2.2.20-r4.patch 126252 RMD160 c5fef72a39012010ac26aaa3bdcce1d5e7895da2 SHA1 24e18fb3f50fe8b34cee07e2895fb214d02212a3 SHA256 a6959afc9048114df21e3119cee75ba667f3004832954c558dd3b72f794857fa
|
||||
AUX calculate-i18n-2.2.21-r1.patch 1143 RMD160 9ab755b1be226b0bac00431aad21d2351e3397f1 SHA1 a842bdd273348f170ec5237d5019550c894e90c3 SHA256 9b8789b9f8e399220771bf836b2580b810ebdad7614919393fc68a1f9a39776c
|
||||
AUX calculate-i18n-2.2.22-r1.patch 2685 RMD160 6784d7fc08ae28f2a3cc0b0402c50a5015f78fb5 SHA1 12d1648f34c19f512ec4d8d80d2603b5e092afa4 SHA256 e855b8899c8a901e02c0aa898a76ec1a4c72272a312527c09731385a990fe42c
|
||||
AUX calculate-i18n-2.2.23-r1.patch 903 RMD160 6e2a2e9e454770310ef998e0ded0454bef960a1f SHA1 04c9120f33e16d421d120b2a45cbf9ee98f38c2e SHA256 a9c58f5a4d82f553d638b6e18b2b0abfec7a3ba99b88cb43af255e0d505c1698
|
||||
AUX calculate-i18n-2.2.23-r2.patch 2216 RMD160 633545cef36f5f250c57a702fb2944193c9f0171 SHA1 623aa3288f9287f048145aaafe179b980d67bd18 SHA256 21aa29ef3a7945a006612c502e290f0df94dade4d10c04f6c263b0cbf261961b
|
||||
DIST calculate-i18n-2.2.19.tar.bz2 27303 RMD160 6b26957485cf49dc247b7bcd2ab50c899e769d55 SHA1 82814fe0368452415ada35bf0bbc07426052fc7f SHA256 d6b4e1c6a15590b9bf1b8db0257a17e971571478d61054d4ab0453f2729d436d
|
||||
DIST calculate-i18n-2.2.20.tar.bz2 27970 RMD160 915663f7501e22d4c38fd5f2b931a87ef38e085c SHA1 f50321956541713d899dc9a806e2504f7c9f20ec SHA256 06e8a53009793d434b721014bf06fc5483f87163215e2d1323e3dde5767d3ab4
|
||||
DIST calculate-i18n-2.2.21.tar.bz2 28100 RMD160 8f785b28db85a946649ee87769d49ca77de9ec7d SHA1 262fad00e1f1127b75c9eaca4b8eef7787371e65 SHA256 bc9d9d1a03d50ed6d561265ee0161f2bea852a00af1685feaab8db247176f85b
|
||||
DIST calculate-i18n-2.2.22.tar.bz2 28293 RMD160 db9203fc78b9875954914939ca90b60b13790d6a SHA1 752e02e36ccfb9a71c35ecf308d3c464c481a760 SHA256 7e30536a0f889bacf4e7ebf02330fd2d0d59e5897af919fa093bf818e858afdf
|
||||
DIST calculate-i18n-2.2.23.tar.bz2 28588 RMD160 1a88fdff12bf698a638ae8230d34f9b7f5e302b4 SHA1 a8df66fa7a5f4b5e8d5a6642d4ab12d3c39f0b20 SHA256 344b281a39efbbcbf4495931bff390eb701c1c30c3307fc38e9b689d325035dd
|
||||
DIST calculate-i18n-2.2.24.tar.bz2 28639 RMD160 f7c640fb100e6bf570fff9b9208eb9dadfe94881 SHA1 6499e206a08499b75df3ac6d9e9e076e3a3ad596 SHA256 12d5b49d6d782203b6c9b6b6dd484d252825e1508ca323255f55ec636eb926be
|
||||
EBUILD calculate-i18n-2.2.19-r1.ebuild 811 RMD160 39f70bc0afdb25768256cfcf3641a1ec5cbe45df SHA1 2c34db4e9a747dcd3c0d1a1b5d0aec4cbc99d880 SHA256 d1f6aeba79583e5349cd28b5c4b4411368790677f0c42ceec458430d3bd0c39c
|
||||
EBUILD calculate-i18n-2.2.19-r2.ebuild 810 RMD160 ecef9752f813c51089ebbb6dbfb539e92fb8f8c6 SHA1 d52b6ae0fbf7d119b4f5af05cb8713afe1b2f59a SHA256 10a683eba2afc303c3f2780d467ff3dc81b6fc1956214727b925d608c1a2de3b
|
||||
EBUILD calculate-i18n-2.2.19-r3.ebuild 810 RMD160 e9e12771f0e9acf1f5870c6468ef4e756805dd00 SHA1 ca48023bd04abca9d188b5fe40933590380a1fa4 SHA256 edb123c353497c7f59c5deced62a82fc46a3803aa2de6b436b17bead61108a8a
|
||||
EBUILD calculate-i18n-2.2.19.ebuild 681 RMD160 60530ce9315c8cd790e55e666c53103ac5c78f18 SHA1 235ca9b393df4663de1418d0c7af4d5113fcad5c SHA256 3610429929d9e00766b4758ada2773bfcd8b587d64c4a9712bcab4a5ee5ae448
|
||||
EBUILD calculate-i18n-2.2.20-r1.ebuild 803 RMD160 ffc07f72d8c275441ae555b618382f2320bb371c SHA1 d3421a1afbe0d70cdd9091e2573eb52aa201d919 SHA256 5895806fc799c7f25e30cb1b423750076f7b6f7b1ab25332341fc58e7064d98c
|
||||
EBUILD calculate-i18n-2.2.20-r2.ebuild 802 RMD160 96934c239a74ce55e377d77cdefc1814994cc70b SHA1 6d423d5695ea3f785dccd4ccf8389111c1f63af5 SHA256 ae76b25a27d75c137716427140b957447299934a6f66f3b5c9b36bc76aa9444f
|
||||
EBUILD calculate-i18n-2.2.20-r3.ebuild 888 RMD160 b42ae96868e48414a70d062308ee7d94810f27e1 SHA1 4a14d0c3d5128c4a0ceb878b4a7c17b0e1289338 SHA256 751482c07d83c10359de078134d12cf34d97c414d58cabff184ea76ead345b3b
|
||||
EBUILD calculate-i18n-2.2.20-r4.ebuild 971 RMD160 0179f413681adb5288e00448c350529dc08e88e6 SHA1 ca80d8a14b138190e78f16ff4e8dc3b03f623bed SHA256 1c70722a23f5f7a32b5eca8cfe11105b0b8f1c26f055f22ef593aed7c3b5bb32
|
||||
EBUILD calculate-i18n-2.2.20.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09
|
||||
EBUILD calculate-i18n-2.2.21-r1.ebuild 812 RMD160 4f1843dedbe340f7e1ab943217b97b69b83c214c SHA1 1fc9ccb8c4769866d0a732df2d579569f2f0db4d SHA256 985acb8ccbe46401be5764fbe969a841ac25530952bcc080caada81d17705a04
|
||||
EBUILD calculate-i18n-2.2.21.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09
|
||||
EBUILD calculate-i18n-2.2.22-r1.ebuild 819 RMD160 1616d084f44483af4bfaccbba4780dcdade6eedc SHA1 9ea8ccb03f7b82eefe980c0c2486ff30f351101e SHA256 9bf055b707b487d6adc834eb80b59b05325a2a1fafd4c07f4425ab755ff78686
|
||||
EBUILD calculate-i18n-2.2.22.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09
|
||||
EBUILD calculate-i18n-2.2.23-r1.ebuild 803 RMD160 5afe1cc858af899084c562aa1876f216d08d02b8 SHA1 6b666364fb5a836fee4828aa636c828625585ea3 SHA256 9e2703b7453850ac1e15d50879e047f3f4c1159f5aa23abf367cde02016aef2b
|
||||
EBUILD calculate-i18n-2.2.23-r2.ebuild 802 RMD160 3fc605f3bf0ca36e3b0fe7fb530db1c4d5bd6207 SHA1 011756b85310e5817938366acaf8c0ba849ba005 SHA256 cc135564da5c94e53396cc7accdecc50a23c2ec34c75be0ae46a00679ad2308c
|
||||
EBUILD calculate-i18n-2.2.23.ebuild 682 RMD160 7c158a21d27de99c219ced2043fddd4f6629a132 SHA1 0d112aab5e8857131b30969a9011fed2f26955b8 SHA256 d9b2a1b26c155475f01d3e42dd15f0222f786b21806fe2fbc7f5b91285394e09
|
||||
EBUILD calculate-i18n-2.2.24.ebuild 683 RMD160 ae6e3866c548be5b270f2815d32af79184918659 SHA1 4fc7dbacb72f031b19abf5db470e7190acc30f2f SHA256 87a1cc42fac1abdc8a62abe0adbd835e4afb98cfe2f088a2f5dc4236a6919b48
|
||||
EBUILD calculate-i18n-2.2.9999.ebuild 680 RMD160 b3d1cfb1045bc3b5da1be318c13fd15919f16aef SHA1 acfe16d8ac67eb88426f46980df3892d7c5a7de7 SHA256 623a395dd35d2620e697b9f8c97d58d3a7220cade8b3a69186050d921d26b802
|
||||
MISC ChangeLog 3402 RMD160 5506cfccd65e8366606ddd0d22ba0183b4dbb217 SHA1 20b357197aabd515f18445ab66712319dc33d818 SHA256 9f3aeda43d010307e8e72a707e5c52307f7caf8101cda5363920d60237fe315a
|
||||
MISC ChangeLog 4505 RMD160 b5cd18a473e97120a126884a51375e133609bafa SHA1 026635d50eb2ad8b01a1bf6fde41b3f44fab66a7 SHA256 17b8e21ea25005eac60ffb4053e74ba0296d7e5327a31de402a1433b5ddaff86
|
||||
MISC metadata.xml 276 RMD160 d9730825fc3ad1b5ea7ba45704121ebd29e38b11 SHA1 c4c1576efbc38119efca43cfa273cb9f433f1de1 SHA256 a2312171d1cbfac41a263c0be692d3d12cfa3aab51979af64487824ae674bc2c
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-${PV}
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update to 2.2.20_rc1
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.19_2.2.20_rc1.patch"
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-${PV}
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for lvmraid
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.19_lvmraid_rc1.patch"
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-${PV}
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for lvmraid
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.19_lvmraid_rc2.patch"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-${PV}
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for btrfs
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-btrfs.patch"
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for install
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-r2.patch"
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for install
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-r2.patch"
|
||||
# update for assemble
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-for_assemble.patch"
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for install
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-r2.patch"
|
||||
# update for assemble
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-for_assemble.patch"
|
||||
# fix bulgarian localization
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.20-r4.patch"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update translate for install
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.21-r1.patch"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# update for install,assemble,builder
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.22-r1.patch"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.23-r1.patch"
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Update for desktop
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.23-r2.patch"
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
# Copyright 1999-2011 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"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
@ -1,26 +0,0 @@
|
||||
commit 2baf3873d9cc8cf05472ed860e1f606e794714fe
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Mon Aug 15 16:24:11 2011 +0400
|
||||
|
||||
Update translate for assemble.
|
||||
|
||||
diff --git a/ru/cl_assemble_ru.po b/ru/cl_assemble_ru.po
|
||||
index ca58591..a2bb9e5 100644
|
||||
--- a/ru/cl_assemble_ru.po
|
||||
+++ b/ru/cl_assemble_ru.po
|
||||
@@ -3,7 +3,7 @@ msgstr ""
|
||||
"Project-Id-Version: calculate-assemble 2.2.20\n"
|
||||
"Report-Msgid-Bugs-To: support@calculate.ru\n"
|
||||
"POT-Creation-Date: 2010-10-18 13:00+0400\n"
|
||||
-"PO-Revision-Date: 2011-07-18 17:12+0400\n"
|
||||
+"PO-Revision-Date: 2011-08-15 16:23+0400\n"
|
||||
"Last-Translator: Calculate Ltd. <support@calculate.ru>\n"
|
||||
"Language-Team: Russian <support@calculate.ru>\n"
|
||||
"Language: ru\n"
|
||||
@@ -516,3 +516,6 @@ msgstr ""
|
||||
|
||||
msgid "configure by %s templates"
|
||||
msgstr "настроить шаблонами %s"
|
||||
+
|
||||
+msgid "For installation '%s' will be installed follow packages"
|
||||
+msgstr "При установке '%s' будут устанавливаться следующие пакеты"
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,75 +0,0 @@
|
||||
diff --git ru/cl_assemble_ru.po ru/cl_assemble_ru.po
|
||||
index a2bb9e5..a2b6e0c 100644
|
||||
--- ru/cl_assemble_ru.po
|
||||
+++ ru/cl_assemble_ru.po
|
||||
@@ -519,3 +519,6 @@ msgstr "настроить шаблонами %s"
|
||||
|
||||
msgid "For installation '%s' will be installed follow packages"
|
||||
msgstr "При установке '%s' будут устанавливаться следующие пакеты"
|
||||
+
|
||||
+msgid "Directory for assembling: %s"
|
||||
+msgstr "Директория для сборки: %s"
|
||||
diff --git ru/cl_builder_ru.po ru/cl_builder_ru.po
|
||||
index 1d6e66a..aec0ca7 100644
|
||||
--- ru/cl_builder_ru.po
|
||||
+++ ru/cl_builder_ru.po
|
||||
@@ -435,3 +435,6 @@ msgid ""
|
||||
msgstr ""
|
||||
"Если вы хотите вручную устанавливать пакеты в собираемой системе, пожалуйста "
|
||||
"выполните:"
|
||||
+
|
||||
+msgid "Execute '%s'"
|
||||
+msgstr "Выполнение '%s'"
|
||||
diff --git ru/cl_install_ru.po ru/cl_install_ru.po
|
||||
index cc1688b..8a02369 100644
|
||||
--- ru/cl_install_ru.po
|
||||
+++ ru/cl_install_ru.po
|
||||
@@ -966,3 +966,48 @@ msgstr ""
|
||||
|
||||
msgid "option is depricated, use '--startup' option"
|
||||
msgstr "параметр устарел, используйте параметр '--startup'"
|
||||
+
|
||||
+msgid "set video driver"
|
||||
+msgstr "установить видео драйвер"
|
||||
+
|
||||
+msgid "set Xorg resolution"
|
||||
+msgstr "установить Xorg разрешение"
|
||||
+
|
||||
+msgid "set frame buffer resolution"
|
||||
+msgstr "установить разрешение для фрейм буффера"
|
||||
+
|
||||
+msgid "set timezone"
|
||||
+msgstr "установить часовой пояс"
|
||||
+
|
||||
+msgid "option {optname}: {errormess}: '{value}' (example: '{example}')"
|
||||
+msgstr "опция {optname}: {errormess}: '{value}' (пример: '{example}')"
|
||||
+
|
||||
+msgid "%s specifing error"
|
||||
+msgstr "ошибка указания %s"
|
||||
+
|
||||
+msgid "X resolution"
|
||||
+msgstr "Xorg разрешения"
|
||||
+
|
||||
+msgid "route"
|
||||
+msgstr "маршрута"
|
||||
+
|
||||
+msgid "disk"
|
||||
+msgstr "диска"
|
||||
+
|
||||
+msgid "frame buffer resolution"
|
||||
+msgstr "разрешения фрейм буффера"
|
||||
+
|
||||
+msgid "%s videodriver is unavailable"
|
||||
+msgstr "%s видеодрайвер недоступен"
|
||||
+
|
||||
+msgid "Install %s driver by command:"
|
||||
+msgstr "Установите %s драйвер командой:"
|
||||
+
|
||||
+msgid "To apply changes you must reboot the system"
|
||||
+msgstr "Для применения изменений необходимо перезагрузить систему"
|
||||
+
|
||||
+msgid "To apply changes you must restart the X server"
|
||||
+msgstr "Для применения изменений необходимо перезагрузить X сервер"
|
||||
+
|
||||
+msgid "%s timezone is wrong"
|
||||
+msgstr "Неправильный часовой пояс %s"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue