parent
b42a5e6fb3
commit
3402db05d4
@ -0,0 +1,34 @@
|
||||
# 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 the desktop configuration Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS=""
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_alpha2
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
media-gfx/feh
|
||||
!<sys-apps/calculate-desktop-3.1.0_alpha1"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-desktop-3.1.1_alpha2-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git desktop/cl_wsdl_desktop.py desktop/cl_wsdl_desktop.py
|
||||
index e07295d..e71f13f 100644
|
||||
--- desktop/cl_wsdl_desktop.py
|
||||
+++ desktop/cl_wsdl_desktop.py
|
||||
@@ -54,7 +54,7 @@ class Wsdl:
|
||||
"""
|
||||
@rpc(Integer, DesktopInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Desktop'),title=__('Configure user'),
|
||||
- image='preferences-desktop',
|
||||
+ image='user-desktop,preferences-desktop',
|
||||
gui=True,command='cl-desktop',
|
||||
rights=['userconfigure'])
|
||||
def desktop(self, sid, info):
|
||||
@ -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=""
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_alpha2
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
!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 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.1_alpha2-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py
|
||||
index a007be4..d4c117d 100644
|
||||
--- install/cl_wsdl_install.py
|
||||
+++ install/cl_wsdl_install.py
|
||||
@@ -192,7 +192,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Installation'),title=__('Flash install'),
|
||||
- image='drive-removable-media-usb-pendrive,media-flash',
|
||||
+ image='drive-removable-media-usb-pendrive,'
|
||||
+ 'drive-removable-media-usb,media-flash',
|
||||
gui=True, rights=['install'])
|
||||
def install_flash ( self, sid, info):
|
||||
"""
|
||||
@@ -220,7 +221,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Installation'),title=__('PXE install'),
|
||||
- image='network-server',command='cl-install-pxe',
|
||||
+ image='network-server,preferences-desktop-remote-desktop',
|
||||
+ command='cl-install-pxe',
|
||||
gui=True, rights=['installpxe'])
|
||||
def install_pxe ( self, sid, info):
|
||||
"""
|
||||
@@ -251,7 +253,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('Network'),
|
||||
- image='network-idle,preferences-system-network',
|
||||
+ image='gnome-network-properties,'
|
||||
+ 'network-idle,preferences-system-network',
|
||||
command="cl-setup-network",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_network ( self, sid, info):
|
||||
@@ -281,7 +284,7 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('Video'),
|
||||
- image='gnome-multimedia,video-display',
|
||||
+ image='video-display,gnome-multimedia',
|
||||
command="cl-setup-video",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_video ( self, sid, info):
|
||||
@@ -369,7 +372,7 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('System'),
|
||||
- image='system,computer',command="cl-setup-system",
|
||||
+ image='system-run,system,computer',command="cl-setup-system",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_system ( self, sid, info):
|
||||
"""
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 130439a..5e0dd96 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -25,6 +25,7 @@ from calculate.lib.utils.files import (readFile,getProgPath,process,
|
||||
readLinesFile)
|
||||
from calculate.lib.utils.common import getPasswdUsers,getUserGroups,getGroups
|
||||
from calculate.lib.utils.portage import isPkgInstalled
|
||||
+from calculate.lib.utils.device import getUdevDeviceInfo
|
||||
from crypt import crypt
|
||||
from calculate.lib.encrypt import encrypt
|
||||
import calculate.lib.cl_template as cl_template
|
||||
@@ -371,6 +372,8 @@ class VariableOsInstallDevFrom(Variable):
|
||||
"""
|
||||
If device in calculate3.env dev_from not exists set ''
|
||||
"""
|
||||
+ if value:
|
||||
+ value = getUdevDeviceInfo(name=value).get('DEVNAME',value)
|
||||
if value in self.Get('os_disk_dev'):
|
||||
return value
|
||||
else:
|
||||
@ -1,10 +1,12 @@
|
||||
AUX calculate-update-3.1.1_alpha1-r1.patch 618 SHA256 c0cb0c41a01602fea0dd05981abcad310dbdeabf4fe92d2134f70cf38be92f80 SHA512 6490fcbfe58122f199ea9be593baa88632c0eb7ac431589c5263514f305b59238391284772d9967ea048c1db3bdea309bf57772dd7be9bac7e7c083eebe7243d WHIRLPOOL 5f090b031dd48db1b5314006d7547e8747fada181e4f7eb11c8e47d1a34c072ffd86b44c86f15a19d95567f3e8f467276902679b62886d9c010f79fb2f36bbdc
|
||||
AUX calculate-update-3.1.1_alpha1-r2.patch 618 SHA256 c0cb0c41a01602fea0dd05981abcad310dbdeabf4fe92d2134f70cf38be92f80 SHA512 6490fcbfe58122f199ea9be593baa88632c0eb7ac431589c5263514f305b59238391284772d9967ea048c1db3bdea309bf57772dd7be9bac7e7c083eebe7243d WHIRLPOOL 5f090b031dd48db1b5314006d7547e8747fada181e4f7eb11c8e47d1a34c072ffd86b44c86f15a19d95567f3e8f467276902679b62886d9c010f79fb2f36bbdc
|
||||
AUX calculate-update-3.1.1_alpha2-r1.patch 517 SHA256 aaa1667dd1a62628d4034a7736415bfd48afac330a9a28f58881f2c1254e460e SHA512 faa36e2d68c47f4291cf26630aebb1f5c2d14a43bb6ebf26f49d61bb95311d2f38d4236bf25f82ae123b4ef076edcd20067067d8cf0e93e81bd5a47e00c65a54 WHIRLPOOL abac0ddf34f09828832457f1102136f7bb9460bcbf0f37d8fba20adff4d20bbc626545bfa557e450d6b1fe995d2ea94cf841bf007745dbc9512f04ff8a40c7a5
|
||||
DIST calculate-update-3.1.1_alpha1.tar.bz2 6862 SHA256 2919eff63d2c0dcacd9012a27be2b513a3d610154087840e18840b5118b8899a SHA512 361612066cbf8dd09c40dcd76b3098890442b3e65887fe9c95951cc8c54282e24ad13ee65d6c7f074dab6afef9d7f359a4c4459b2beec3d82970e5d344254d84 WHIRLPOOL 90e536ace678c2f5e11aa464941e2897611aa71c848c19e80956095b87b393d44599cdd7a95faac2edc7c95feb790012bd4e866f51eb5ccf24eeb51c6fff9937
|
||||
DIST calculate-update-3.1.1_alpha2.tar.bz2 6859 SHA256 99c8593dc5a0e7fe7cb317ebaae93704d56f728fa6d689ca998ded0146e8ff23 SHA512 b2a9fc1c9f41601dbc407786ddb4b46ea1bfd0f1a25eb7eb22b86f8176187c3a5f059d1305574d725059e2903ffa37fd9ad876f6f54e448dc337e1d578485f72 WHIRLPOOL e86f6b1f89c01db2a46701fb7e7e0dcc5e8e29b548adc117c45dfd5b106f6054957b064a86da9beb66c38f3bc4054798266af2d316843d4c3047e098dc7ea487
|
||||
EBUILD calculate-update-3.1.1_alpha1-r1.ebuild 695 SHA256 931e8ce6f0cc5207e1b0d03ccc97e4cfa147c7928b8550bdd09f46f34df05076 SHA512 e37d6af5b18e3378645a86c51d50e686c9f000e1845e40799d62fba032d357599800b0475a035d1ef3996e6bfb2ab026f4596c9604e6c38bf299662ea4e93a90 WHIRLPOOL 95bb0da3deeb990865ba9e4a91cf1d99f7ebd27ad7524678e4c1765fc454cae7b13364e9d4f5ceced509fd07e8856bbf529391e26f0023efab6f38eff053b4e2
|
||||
EBUILD calculate-update-3.1.1_alpha1-r2.ebuild 552 SHA256 b6b59aa56455d808e4ffe81848a9323cb1b54b44aee84852a566129f980c93bd SHA512 20f8fefe66e3f78ac04fcb4ceab1a4f117d8fa3c929be32ed2fea609c85e00614b7ca7410700018d85cf9b71d3fa5cf43abcd5e4598dbfe398300d77184b8f84 WHIRLPOOL 01d62b1bdc8e2556f4983b221e9fd6fcc1ef8148eb78b512741d02049c9c8644c291578495b5719bfc3e199cf24b884b0eafabc37fe370a744d1666fd0d9e3e9
|
||||
EBUILD calculate-update-3.1.1_alpha1.ebuild 552 SHA256 1dca36fe27b9663848f82d88d8184b3e6a45d6dc3bd9d6ad624716895a2e1f83 SHA512 c4c8a7581198242d95f5997db116526a50cc7c87e70a0acc83978a871ead28cedee76f3cc6d3b4fb6b2aa983d64adbbe3aa373b61c47d907485a40d4b6806119 WHIRLPOOL 48da369410fed49486738225bf9453e97b18135ace67260ef12509ff972db21b750bdc3f544c515d1853e646d473296681e6b18c7f914067aa2f354cb6da4e3b
|
||||
EBUILD calculate-update-3.1.1_alpha2-r1.ebuild 695 SHA256 2fab43b2c30c857cf5d7786661f111bb78f36577a55558fa23e63d35de877cc7 SHA512 6a511a8bb4f0b171b26f8c303e0c69a417cd0e205a72db92f9a8b36f13a22e72e40333f2360643ad1840338e77509093b9a26643747b2bfd7500c8f577fca9c7 WHIRLPOOL f366ef88b08816f1b55bb7245782e4569bb89eff0d8393523ba6f8d50bfe8c479ca95e8199a1cbd6c2e828963e0c85ec8895413eb0d038f5e59fbed9b21bdf8d
|
||||
EBUILD calculate-update-3.1.1_alpha2.ebuild 552 SHA256 b6b59aa56455d808e4ffe81848a9323cb1b54b44aee84852a566129f980c93bd SHA512 20f8fefe66e3f78ac04fcb4ceab1a4f117d8fa3c929be32ed2fea609c85e00614b7ca7410700018d85cf9b71d3fa5cf43abcd5e4598dbfe398300d77184b8f84 WHIRLPOOL 01d62b1bdc8e2556f4983b221e9fd6fcc1ef8148eb78b512741d02049c9c8644c291578495b5719bfc3e199cf24b884b0eafabc37fe370a744d1666fd0d9e3e9
|
||||
EBUILD calculate-update-3.1.9999.ebuild 530 SHA256 f014911ae52c1eadd9615ab1a2c930eb79aab49f509260bd6573eb3985ce2ec8 SHA512 3523efdb19b9646a0d1dba6d6a4664393d07f9aa666392d355b4596cb1bca8cd80a62bbd7f6db7029c1173ebb2a16e9cf168cea1d7f2c051ba8838c86c234454 WHIRLPOOL a394a23a0277b40cc2e7242b08750638434c3b6bf0f340fec923f90e738618b1cc0e223e327484f95d24f7637e8bebec6dff4b6385b731376f6f8cc8897caf79
|
||||
MISC metadata.xml 288 SHA256 9ea2bfebe4ac64765041ad92dda5b8f22f5597a4e560458f98996b00b0393b8a SHA512 88886b3e137bcf7038cc4985b786523dfac1c127aff84ad682b919d92b2c51b0b8d8f97ff60e7239a2ef49ec40fb5dcc41a59cb428ed346f1e44044ecd75b698 WHIRLPOOL d4eb5ba4901e10fe9cf440c63a8a9a59b5e6620004306eec3cd162cf902a89510460774a8c407816bf15033062dc8f96a334e7f873801bc6bcd73edeb833f36b
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# 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=""
|
||||
IUSE=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_alpha2"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.1.1_alpha2-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
diff --git update/cl_wsdl_update.py update/cl_wsdl_update.py
|
||||
index 784dcff..c3b4a13 100644
|
||||
--- update/cl_wsdl_update.py
|
||||
+++ update/cl_wsdl_update.py
|
||||
@@ -53,7 +53,7 @@ class Wsdl:
|
||||
"""
|
||||
@rpc(Integer, UpdateInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Update'),title=__('Update world'),
|
||||
- image='preferences-desktop',
|
||||
+ image='software-properties,preferences-desktop',
|
||||
gui=True,command='cl-update',
|
||||
rights=['update'])
|
||||
def update(self, sid, info):
|
||||
@ -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=""
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.1_alpha2-r2
|
||||
=sys-apps/calculate-i18n-3.1.1_alpha2
|
||||
=sys-apps/calculate-lib-3.1.1_alpha2
|
||||
=sys-apps/calculate-core-3.1.1_alpha2
|
||||
=sys-apps/calculate-update-3.1.1_alpha2-r1
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_alpha2-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_alpha2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue