commit
d17635e690
@ -1,7 +1,9 @@
|
||||
AUX calculate-install-3.2.0_alpha7-r1.patch 1582 SHA256 4f8794a4ffe6aeeaf00e9aa8159dc8c6ce62661ca49c3c18829ece214fbb7147 SHA512 a719da9355162cd7cc8691c8eb2af38c9ae7c30825b3cab2da2bc4ddcd56a16cda27d88520ee29eeb8bc4b6cd3414023a8ba6038cd3ecc9beac1e447d0cc2de5 WHIRLPOOL dd4af140298d5c56d0d70fbb22c4594bd351fe70c9b08db002bceef13041deb40f7569dd5f065d205f16dc1ba51e33644e85918d19cda279dd2b5dba2eefd6e3
|
||||
AUX calculate-install-3.2.0_alpha7-r2.patch 2968 SHA256 85982512bece11de4cdcba9649e4e25724366f80d9d40053d69a1e0df6ea7285 SHA512 82a7e87066ce9f8bc571f88d1e5380ddc7881cc07e47b12262fa228b09a9d36b5f4cf0343e0e4aaebc820aa4005fd961ed65f132893580a11c38e9b67535c63c WHIRLPOOL 9a12a7b8d6231d76011ba7164dfa598a6d6a70c4c435ea98c80cc3819d1dacced62d1f5972926f03ab8725f7f5df5c087a9f6cb4aeccd480d78ad365246a7107
|
||||
DIST calculate-install-3.2.0_alpha6.tar.bz2 77185 SHA256 a7ef2b34ed7a3b59eae49260bb8e7a5ed4eacb6c3dd3bf23baf73ba70e85ae07 SHA512 55e0b230723181d0b732e53135b458a73d436875b76c928677865053e3884de32741fa9f964ba7029802f56adf4d83f0fda0efc19af0547c0aec2853c1ce0fee WHIRLPOOL 7873b23d068939b94b88420d3e1c4ed9e7f4975f5c8acdf0b1209cf91a3576bd7051f015f1235c81c2a5b1375e25a408004880edf34c5a240600f55923fcf655
|
||||
DIST calculate-install-3.2.0_alpha7.tar.bz2 77177 SHA256 a03bc2dcc969a899af47b17c6e8c73572f7536825ed0dba38181004c5bdd2d49 SHA512 8d2f298e9a39e85eb2cd097e77c9f2995ac2f4c683b306956806f1ea220f8238a75870fbc8345f6248d41a25b6a9b1d141c30507c63a5d16f8187b02e6cf51ac WHIRLPOOL b34095ea200c698f3f0189636941fda6834c5b482e60356ccb53df453e00e846b086eb15fde08cf82a00b4a8fc9418ee516db06486791e45d52c50d792e67c25
|
||||
EBUILD calculate-install-3.2.0_alpha6.ebuild 912 SHA256 90162bd69aa98810a7cb2083bb76e395806aa1f18c56880d292a61501eacb1d3 SHA512 86d1975cf6fc9ae795ac30ccd74ba682e3bf91c47533a43c1045edd0e97591d4f3e5146492f573fb9fbae703c29d1cfbd33e13a43e708f673d4750e7d4f20b5a WHIRLPOOL a13022978dea3a31d90c77b0d4b32028593e632187ce74ad261922c0ac0aaafdc0de1ef3d93cfe0e2f405c4bb7c8bccfe9773c38ec35e3a6f68af8b6eff4e975
|
||||
EBUILD calculate-install-3.2.0_alpha7-r1.ebuild 1057 SHA256 78a3d14b13c4f1026e56f6d2d69b9fe2c0a85b283dcc5cbf3307f371ea6ae8bb SHA512 959bc98a48ca30aa72230dd6af4fe852193d485e73964181068c8711a28bf7f6b64146a5577d0421d83f4a6ac7723d8464ad0ba69ba33bf8cf7a2b3384e4c494 WHIRLPOOL 90b6bbc085687f1d4c8690db12c51fb7c15681c0363a823cce8cb012cd2c0c57b35c664d3b4d22c9c5bc77c0a2309865c758db7ebd76070b8a769ed1f36c4346
|
||||
EBUILD calculate-install-3.2.0_alpha7-r2.ebuild 1057 SHA256 0e98df45b02abbc1674b524571d45a34a65f6da3c18c5bd51d6a10d67459348d SHA512 27f4e007cb91cb07546ceb61f1373a7ff089e47547e6162df1d20bca64357f92bb84eee45b2f1f926d9edc4988cb8ecf1d95dcf5bd5451d5a1c1e777b93b51b7 WHIRLPOOL eed15132339600fa5497e1fd5df358d4d5b95a489582f1ba588b57bc7e0a427428b09ee1b70fa44d65fd378a2207c69bd9fbac0bf7d1f0ed06fd1d41f724c740
|
||||
EBUILD calculate-install-3.2.0_alpha7.ebuild 912 SHA256 357670ed6057184cea7e6abc3f15e40f1e65e4a0dc099058ad335869c8ccc9ff SHA512 5005816cd85e777d08ffdebd0622bf0a90a178ccd30c42d9da1cc5ef3d598c1fcc96dce50d8e6302fb9b35fc2a8ad0b178867b8d9c4748469a38ca6aeec9acb0 WHIRLPOOL 83fa722c6a4b3b917e02d4d01c4fc3037f07ac4e5d9baabeb81f872407c23cfc2e10e60de86d5b61fc0fb81949a3a80173f34ff33809b64c68a639a07e91dd16
|
||||
EBUILD calculate-install-3.2.9999.ebuild 683 SHA256 e355d430ae0b2a2103d5c959adf7fa57a23d4bfa17d77c2bd698114fe6c471ce SHA512 de416bd2be0d4928fc2934724abcd3fd168ba8a945bd680a61b990d01805f3dd22c1955bb819f271357fd12bccd91c25daa058b3c667deeceb255c5d713ff0c6 WHIRLPOOL dcfb7e979a63dad506743834f09b8192fbb5ddd637fde5a6890fa7412b453fa99b7d94f3229149061469ce1a541a1560f97de875aa61a9aa301d5fe97408876c
|
||||
|
||||
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha7
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=virtual/udev-197
|
||||
!app-misc/livecd-tools
|
||||
sys-apps/iproute2[-minimal]
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.2.0_alpha7-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index c7f60b9..60a24b0 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -134,10 +134,6 @@ start() {
|
||||
touch /* /bin/* /sbin/*
|
||||
udevadm trigger --action="add" --subsystem-match=net
|
||||
fi
|
||||
- if [[ $roottype != "livecd" ]]
|
||||
- then
|
||||
- /usr/bin/eix-checkout &>/dev/null &
|
||||
- fi
|
||||
|
||||
/sbin/rc-update --update
|
||||
return 0
|
||||
diff --git install/distr.py install/distr.py
|
||||
index ae94ddb..e6202e8 100644
|
||||
--- install/distr.py
|
||||
+++ install/distr.py
|
||||
@@ -754,7 +754,7 @@ class PartitionDistributive(Distributive):
|
||||
mulipartDataNotBind = filter(lambda x: x[2]!="bind",
|
||||
self.getMultipartData())
|
||||
for dev, mountPoint, fileSystem, isFormat, partTable\
|
||||
- in mulipartDataNotBind:
|
||||
+ in sorted(mulipartDataNotBind, key=lambda x:x[1]):
|
||||
if fileSystem!="swap":
|
||||
realMountPoint = pathJoin(mdirectory, mountPoint)
|
||||
self._mountPartition(dev,realMountPoint,"-t %s"%fileSystem)
|
||||
diff --git install/variables/net.py install/variables/net.py
|
||||
index e9e400d..01b0032 100644
|
||||
--- install/variables/net.py
|
||||
+++ install/variables/net.py
|
||||
@@ -790,3 +790,24 @@ class VariableOsInstallNetSettings(NetHelper,Variable):
|
||||
|
||||
def choice(self):
|
||||
return [("","")]+self.Get('os_install_net_conf_available')
|
||||
+
|
||||
+class VariableOsInstallPxeIp(Variable):
|
||||
+ """
|
||||
+ IP адрес PXE сервера
|
||||
+ """
|
||||
+ type = "choice"
|
||||
+ opt = ["--ip"]
|
||||
+ metavalue = "IP"
|
||||
+
|
||||
+ def init(self):
|
||||
+ self.label = _("PXE server IP")
|
||||
+ self.help = "set IP address for PXE server"
|
||||
+
|
||||
+ def get(self):
|
||||
+ for ipaddr in ifilter(None, self.Get('os_install_net_ip')):
|
||||
+ return ipaddr
|
||||
+ else:
|
||||
+ return ""
|
||||
+
|
||||
+ def choice(self):
|
||||
+ return filter(None, self.Get('os_install_net_ip'))
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index f810ea8..69e800e 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -86,8 +86,6 @@ class VariableOsFormatUse(ReadonlyVariable):
|
||||
'value': "off"}
|
||||
|
||||
def checkFunc(self,fs):
|
||||
- if fs == "btrfs" and self.Get('os_root_type') == 'livecd':
|
||||
- return "no"
|
||||
if "format" in FileSystemManager.supportFS[fs] and \
|
||||
path.exists(FileSystemManager.supportFS[fs]["format"]):
|
||||
return "yes"
|
||||
diff --git install/wsdl_install.py install/wsdl_install.py
|
||||
index 974b6a4..c9bc196 100644
|
||||
--- install/wsdl_install.py
|
||||
+++ install/wsdl_install.py
|
||||
@@ -150,7 +150,8 @@ class Wsdl(WsdlBase):
|
||||
'groups':[
|
||||
lambda group:group(_("PXE install"),
|
||||
normal=('cl_image_filename',),
|
||||
- expert=('os_install_pxe_path',),
|
||||
+ expert=('os_install_pxe_path',
|
||||
+ 'os_install_pxe_ip'),
|
||||
next_label=_("Install"))]},
|
||||
# настройка аудио
|
||||
{
|
||||
@ -1,7 +1,9 @@
|
||||
AUX calculate-lib-3.2.0_alpha6-r1.patch 4151 SHA256 4070948bf227f5fb60dc89f1794d9dcf15a9fce48a5b9b5318d9223d71364da7 SHA512 4dbfa5a48c24556979a2a73b184eecc976b8738cc05bbffccfa2792a992e9d21ed1f37bbe21e4401eb2c92678f90b692e30b25119473908b3585a2fd226f74cd WHIRLPOOL bff16327876d77abc7b37006ff06d44f17aeb8de1043fc86c59b76833c97a5de52b73a966e3174cc5ff57d347c829d3f219767855458a5e46cb4b948da7be5d8
|
||||
AUX calculate-lib-3.2.0_alpha7-r1.patch 1118 SHA256 35133f7a5eda8d6e53d64f01ba473b0c219a8f2b333d4cd0ab43a40648b8d987 SHA512 cdd362da23c490846ad923b407f5bc26204ee3023a0dd600768222f31aedef9cdf42bac1a8f1a7cf3264847cb61705d3fc9a19f10de14afa3f0abe4e38b31555 WHIRLPOOL 820b6e8f5233ba1ccdbaf8ef78650ca0ef07bd83b1ba08a6747103b34c4858a89a5066267d84054072eaa0e98bba86ff50da625042b1f4cf251714dbaa8d1b34
|
||||
DIST calculate-lib-3.2.0_alpha6.tar.bz2 131821 SHA256 8f717b7c520e8d2cfdfa30dfc1d0b3eec0de33b3d9aedb768318aab5f28b11fc SHA512 6339c2c8ff0640b9365463142420e2045a70b99f6379c59d9a08d9701fd7deb05a7143761f5c897ebfea82bfc6098e3be76418dcc412a42439c07984f049b041 WHIRLPOOL 8d71acceb708135d70c196f2d16e33bd7162d757c44b25304131b9bf2263f9580c4ff55a8fd82c0c4aa3c92f7844805d241fe864c7720736bbe2431b2045bafd
|
||||
DIST calculate-lib-3.2.0_alpha7.tar.bz2 131887 SHA256 e4248f39c08807a5e8974c3de442405496b63ce2df81ce4d4b72b75422989d22 SHA512 21e01131546d59b437cb358f5d0a8e07e30d79a68bb192639f943f6c51bb2da68b0b63d43b4e31205c9aeed266eb63db2becd66734847450618650a5e1cdcaae WHIRLPOOL 5e0a7b0cca05ffe05947f844e2f8947c3f62973c64a4cc8ec14c406259bb607c2a90e7fbca86898efccf8d69383dec42469a00888220b41f2612c504393a02e7
|
||||
EBUILD calculate-lib-3.2.0_alpha6-r1.ebuild 831 SHA256 6ef8bf48d4fc1b2210c0940aa8300eef928a381e86eb90fff1e7c0862dba182a SHA512 1582bbf375bc8c5f10aa65c18aa7ab886d84cafe991ae799483c10a5025a5b4bd12b58f5a1d172e425e542d595951c495d80417782b321b8c2efaca5d697c1e1 WHIRLPOOL 43fe9b18cf7669b6869dd6ae94f75ab40affdb10993cfc50437a6b6bed06bdf20bbb5a8c663c33a557e5a3d78f60ee5a272458b74dc988ced56945d7befa67d6
|
||||
EBUILD calculate-lib-3.2.0_alpha6.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
|
||||
EBUILD calculate-lib-3.2.0_alpha7-r1.ebuild 831 SHA256 5a7e3ebf3f6b316b41d56cdf0b53446c7c9cef11b345d678866bc5e475449796 SHA512 e26c304d0c34b91d0a0259fc8bcabcf2499d29b9f65b99af909ff2d516bda8a7344d8141ca098e49b99b0c0bbc518e202c3e103c96f0efb83d59f4a912df609c WHIRLPOOL dc1e24c43049f08c4bd14868e7d9c49061701dd01bb8fca85a1f378519a25d1a6f2d955db5afe4cf529899516fda5332514c887f78eb7eba35fa22e06d876966
|
||||
EBUILD calculate-lib-3.2.0_alpha7.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
|
||||
EBUILD calculate-lib-3.2.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.2.0_alpha7-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
diff --git calculate/lib/datavars.py calculate/lib/datavars.py
|
||||
index 905f889..eb7f38d 100644
|
||||
--- calculate/lib/datavars.py
|
||||
+++ calculate/lib/datavars.py
|
||||
@@ -1610,7 +1610,7 @@ class DataVars(SimpleDataVars):
|
||||
choicedata)
|
||||
if len(result) > 1:
|
||||
raise VariableError(_("Ambiguous choice:%s")%
|
||||
- ",".join(map(
|
||||
+ formatListOr(map(
|
||||
lambda x:'"%s"(%s)'%(x[1],x[0]) if x[0] != x[1] else x[0],
|
||||
result)))
|
||||
elif result:
|
||||
diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
|
||||
index 1f5bf42..5e18176 100644
|
||||
--- calculate/lib/variables/__init__.py
|
||||
+++ calculate/lib/variables/__init__.py
|
||||
@@ -41,4 +41,4 @@ class VariableClVer(ReadonlyVariable):
|
||||
"""
|
||||
Package version
|
||||
"""
|
||||
- value = "3.1.9.3"
|
||||
+ value = "3.2.0"
|
||||
@ -1,5 +1,7 @@
|
||||
AUX calculate-update-3.2.0_alpha7-r1.patch 1086 SHA256 4de503ac11c623bae15c770e2d8a66679972dd3d358cb1852c34c553ebde77aa SHA512 eaa0e099441e4e55e0d98818c679590bdc421ac3029df4111ac280847921bb100fbc2af7886917e48582f3d1220e0b3e221d5537cf1a029265d790f1077b209a WHIRLPOOL 6b00347e85c4ee747a43e4cf0ad6dc411b9529d62c8296f0ed82291ccdd68823f45f110d3f23347a637e822f9a4407c57a3f3dd4aafbd0953ba83f935d4f3b1f
|
||||
DIST calculate-update-3.2.0_alpha6.tar.bz2 24918 SHA256 ba6c633330d68761bc426750dd5b3bb52d75843c1e5adc6f1ee41daa032e1e2e SHA512 c44e02e158758e5f1bfb26d1f1f276d27664e072df9aa3485840d4853320671a0323dc03ccfc31e78f1ae66003416d5723383967991fefbb5c427ec8447dccee WHIRLPOOL 14d5fbec32105e18f31304d7c70f1c57b98b4c3ffd83ca4bc209c622b71df218f2c63f006fb15b5804676c0421b86c05ac6ffef26651e1336a5cf820701900ff
|
||||
DIST calculate-update-3.2.0_alpha7.tar.bz2 25167 SHA256 73354a7256acf3939c988fd08f79ecee1ea79def52c6a70d4f3eb2b30057f0ed SHA512 b50befb55b22128e5038934b5184e86d039b5cd04b2f2df8446a5bf471229ad27bf324fb889157a7d5ce2351e4709cfac29c8a985930cde89d140197adb82034 WHIRLPOOL 92febfbec36985a9636783423ae86d230d2bc8586865165e24fa913046daa8de84206dbc9ab9ce3a8a87eee050a50813511d102fd66b37f2f83e0be4c64ce270
|
||||
EBUILD calculate-update-3.2.0_alpha6.ebuild 623 SHA256 2c6730fbbeb47c9e2d20d18451900e1fa6db0cb380421533bb4ef8beeb19ede2 SHA512 147fc1940845797014c7b725780dd3b1c17b87bfcb2906d62f95ec56c3e1fb04c72a050f24b9ac9d8ffd81ea98e394f6649735dd8b31232fe13febbee74f2e0f WHIRLPOOL fea68cc4175de5f4e52c6a527d53375d9921e4bb3003f25d540c618d9fdc987a2bc255aec1755868a56f3c531dd2264b2481b06c240ca536d478615213bab9b0
|
||||
EBUILD calculate-update-3.2.0_alpha7-r1.ebuild 767 SHA256 c02c8830e89746538d8964b46819d3a9b43f85f4e1496edc6f61e0325c0291f5 SHA512 35f801d2c38972a9ea9783e24fa94155abedb299b1e0ed808b0c37606856e5d4f1e32b5d81c43beb9f8de9f37354b00199fa12144e0727e726ae5e060661122e WHIRLPOOL 7162e3e7b24c9b40130114a6180f402a4fcf6e0402459236859b884d700dff579dfeca6f0d860a63f7134bc157b9982003fa2aa97e4aee197b8bb71794bbcf56
|
||||
EBUILD calculate-update-3.2.0_alpha7.ebuild 623 SHA256 7bd0dfb4a6c818a8e1727d0830cfeda2dc19ff193dc5c920090569ff1c9fb58b SHA512 6a88fe0a67a65af232001c4ea13d6a40327c4c4d177b06b64ef5afd387349f654faec1c5d52af6c35373ef77d0802622a9fb9fe720b08202baa116d9e2fcc18c WHIRLPOOL 4ebe91b2db932cf521558fe7618faf6550c55f5cd0e674585d854ac81f013f4d4fac2fae6341f8ea238c2b5f288e4842ef213a0ab52abb802043e2d51ae484b7
|
||||
EBUILD calculate-update-3.2.9999.ebuild 530 SHA256 9558d49a6b95f73c67f79c835e4003725ba7ae7e0492ea336737da16fe2f5005 SHA512 466bce621f4073bfbf4d34063cbb54077910baa5e40637d5d8d23044edccc9d79bb764db25e05b68969f1bd63573a1c0bc04676f45a6bbeca173503df6887767 WHIRLPOOL 0107e9b7746739a9be77664aa9e6907c9e511ac0422721d709fe63ffb4a55246a2d6c494280bd3b72e50d8e1aecb7f811cfdd112c482168bd9fa17c4ff0d5eaf
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of update Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha7
|
||||
~sys-apps/calculate-install-3.2.0_alpha7
|
||||
dev-python/pexpect"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.2.0_alpha7-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
diff --git update/emerge_parser.py update/emerge_parser.py
|
||||
index 204e758..80d012b 100644
|
||||
--- update/emerge_parser.py
|
||||
+++ update/emerge_parser.py
|
||||
@@ -321,7 +321,7 @@ class QuestionBlock(EmergeInformationBlock):
|
||||
"""
|
||||
Блок вопроса
|
||||
"""
|
||||
- default_answer = "no"
|
||||
+ default_answer = "yes"
|
||||
_color_block = EmergeInformationBlock._color_block
|
||||
token = "Would you like"
|
||||
end_token = ["]", "\n"]
|
||||
diff --git update/update.py update/update.py
|
||||
index 50dd30b..77b1d9b 100644
|
||||
--- update/update.py
|
||||
+++ update/update.py
|
||||
@@ -94,6 +94,10 @@ class Update:
|
||||
git.checkoutBranch(rpath, branch)
|
||||
if revision == "last":
|
||||
if git.resetRepository(rpath, to_origin=True):
|
||||
+ # если не удалось сбросить
|
||||
+ repInfo = git.getStatusInfo(rpath)
|
||||
+ if repInfo.get("files", False):
|
||||
+ raise GitError("Failed to reset git")
|
||||
needMeta = True
|
||||
else:
|
||||
git.resetRepository(rpath, to_rev=revision)
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.2.0_alpha7-r2
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha7
|
||||
=sys-apps/calculate-lib-3.2.0_alpha7-r1
|
||||
=sys-apps/calculate-core-3.2.0_alpha7-r2
|
||||
=sys-apps/calculate-update-3.2.0_alpha7-r1
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha7-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha7 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha7 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha7 )
|
||||
"
|
||||
Loading…
Reference in new issue