sys-apps/calculate-utils: обновление

* добавлена поддержка работы c m2crypto без патча
* исправлено определение ip адреса на bridge
mhiretskiy
parent b1aa04a9ec
commit 2d226c7d79

@ -0,0 +1,315 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: calculate-utils-r5.eclass
# @MAINTAINER:
# support@calculate.ru
# @AUTHOR:
# Author: Mir Calculate
# @BLURB: Functions for calculate-utils
# @DESCRIPTION:
# This eclass use for calculate-utils ebuild
PYTHON_COMPAT=(python2_7)
inherit distutils-r1 eutils versionator
EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
CALCULATE_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate3"
MIRROR_URI="http://mirror.yandex.ru/calculate/source/calculate3"
# @ECLASS-VARIABLE: CALCULATE_MODULES
# @DESCRIPTION:
# Associative array module names and versions
# Example:
# declare -A CALCULATE_MODULES=(
# ["console-gui"]="3.2.3.4"
# )
# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
# @DESCRIPTION:
# Associative array module names and use for IUSE
# Example:
# declare -A CALCULATE_MODULES_USE=(
# ["console-gui"]=""
# )
# @ECLASS-VARIABLE: CALCULATE_TARBALL
# @DESCRIPTION:
# Associative array module names and tarball archive name
# Example:
# declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
# @ECLASS-VARIABLE: UTILS_PV
# @DESCRIPTION:
# Default version of all components
# Example:
: ${UTILS_PV:=$(get_version_component_range 1-3 ${PV})}
declare -g -A CALCULATE_TARBALL_=()
declare -g -A CALCULATE_MODULES_=(
["lib"]="$UTILS_PV"
["builder"]="$UTILS_PV"
["install"]="$UTILS_PV"
["core"]="$UTILS_PV"
["i18n"]="$UTILS_PV"
["update"]="$UTILS_PV"
["desktop"]="$UTILS_PV"
["client"]="$UTILS_PV"
["console-gui"]="$UTILS_PV"
["console"]="$UTILS_PV"
["server"]="$UTILS_PV"
["ldap"]="$UTILS_PV"
["unix"]="$UTILS_PV")
declare -g -A CALCULATE_MODULES_USE_=(
["desktop"]="desktop"
["client"]="client"
["console-gui"]="qt5"
["console"]="console"
["server"]="server"
["ldap"]="server"
["unix"]="server"
)
EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
# @FUNCTION: prepare_variables
# @DESCRIPTION:
# Prepare variables for ebuild
prepare_variables() {
for module in ${!CALCULATE_MODULES[@]}
do
CALCULATE_MODULES_[$module]=${CALCULATE_MODULES[$module]}
done
for module in ${!CALCULATE_MODULES_USE[@]}
do
CALCULATE_MODULES_USE_[$module]=${CALCULATE_MODULES_USE[$module]}
done
for module in ${!CALCULATE_MODULES_[@]}
do
MODULE_PN=calculate-${module}
MODULE_PV=${CALCULATE_MODULES_[$module]}
if [[ -n ${CALCULATE_TARBALL[$module]} ]]
then
CALCULATE_TARBALL_[$module]="${MODULE_PN}/${CALCULATE_TARBALL[$module]}"
else
CALCULATE_TARBALL_[$module]="${MODULE_PN}/${MODULE_PN}-${MODULE_PV}.tar.bz2"
fi
done
for module in ${!CALCULATE_MODULES_[@]}
do
MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
MODULE_URI=""
for URI in $CALCULATE_URI $MIRROR_URI
do
MODULE_URI="${MODULE_URI} ${URI}/${CALCULATE_TARBALL_[$module]}"
done
if [[ -n $MODULE_USE ]]
then
MODULE_URI="${MODULE_USE}? ( $MODULE_URI )"
fi
SRC_URI="$SRC_URI $MODULE_URI"
done
IUSE="+install dbus +gpg minimal pxe backup ${CALCULATE_MODULES_USE_[@]}"
S="${WORKDIR}"
}
# @FUNCTION: prepare_module_info
# @DESCRIPTION:
# Prepare module info for compile and install
prepare_module_info() {
MODULE_INFO=()
for module in ${!CALCULATE_MODULES_[@]}
do
MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
if [[ -z $MODULE_USE ]] || use $MODULE_USE
then
MODULE_INFO+=("calculate-$module ${CALCULATE_MODULES_[$module]}")
fi
done
}
prepare_variables
RDEPEND="
install? ( >=app-cdr/cdrtools-3.01_alpha13
>=sys-boot/grub-2.00-r3
>=sys-boot/syslinux-5
sys-fs/squashfs-tools
sys-fs/dosfstools
sys-block/parted
sys-apps/gptfdisk
sys-fs/lvm2
sys-fs/mdadm
)
!minimal? (
dev-python/passlib[python_targets_python2_7]
>=sys-apps/util-linux-2.19.1
net-misc/rsync
dev-python/sudsds[python_targets_python2_7]
net-libs/dslib[python_targets_python2_7]
>=dev-python/pyopenssl-0.14[python_targets_python2_7]
dev-libs/openssl
dev-python/m2crypto[python_targets_python2_7]
dev-python/cherrypy[python_targets_python2_7]
dev-python/pytz[python_targets_python2_7]
)
gpg? (
app-crypt/gnupg
app-crypt/openpgp-keys-calculate-release
)
>=dev-python/pyxml-0.8[python_targets_python2_7]
sys-apps/iproute2[-minimal]
sys-apps/pciutils
dev-python/progressbar[python_targets_python2_7]
app-arch/xz-utils
dev-python/pyinotify[python_targets_python2_7]
sys-apps/file[python,python_targets_python2_7]
app-portage/layman[python_targets_python2_7]
sys-apps/portage[python_targets_python2_7]
dev-python/pyxattr[python_targets_python2_7]
>=virtual/udev-197
!app-misc/livecd-tools
sys-apps/coreutils[xattr]
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils
)
>=dev-python/soaplib-1.0
!<sys-apps/calculate-server-2.1.18-r1
desktop? (
media-gfx/feh
x11-apps/xmessage
sys-apps/keyutils
sys-auth/pam_keystore
dev-lang/swig
dev-qt/qdbus:5
)
server? (
sys-auth/pam_ldap
sys-auth/nss_ldap
dev-python/python-ldap
)
client? (
dev-python/py-smbpasswd
>=dev-python/python-ldap-2.0[ssl,python_targets_python2_7]
sys-auth/pam_client
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
)
qt5? (
dev-python/dbus-python[python_targets_python2_7]
|| (
dev-python/pillow[python_targets_python2_7]
dev-python/imaging[python_targets_python2_7]
)
dev-python/PyQt5[python_targets_python2_7]
)
dbus? (
dev-python/dbus-python
)
dev-python/pexpect[python_targets_python2_7]
!<sys-apps/calculate-lib-2.1.12
!sys-apps/calculate-lib:3
!sys-apps/calculate-i18n:3
!sys-apps/calculate-client:3
!sys-apps/calculate-desktop:3
!sys-apps/calculate-console:3
!sys-apps/calculate-console-gui:3
!sys-apps/calculate-update:3
!sys-apps/calculate-install:3
!sys-apps/calculate-core:3
server? ( !sys-apps/calculate-server )
backup? ( !sys-apps/calculate-server )
"
DEPEND="sys-devel/gettext"
REQUIRED_USE="client? ( desktop )"
# @FUNCTION: calculate-utils-r5_src_compile
# @DESCRIPTION:
# Compile all modules of calculate utils
calculate-utils-r5_src_compile() {
if ! use backup
then
sed -ir "s/'cl-backup'/None/" calculate-core-*/pym/core/wsdl_core.py
sed -ir "s/'cl-backup-restore'/None/" calculate-core-*/pym/core/wsdl_core.py
sed -ir "s/__('Backup')/None/g" calculate-core-*/pym/core/wsdl_core.py
fi
prepare_module_info
for MODULE in "${MODULE_INFO[@]}"
do
MODULE_DATA=( $MODULE )
MODULE_PN=${MODULE_DATA[0]}
MODULE_PV=${MODULE_DATA[1]}
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
cd $S
if [[ $MODULE_PN == "calculate-lib" ]]
then
sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
pym/calculate/lib/variables/__init__.py
fi
distutils-r1_src_compile
done
}
# @FUNCTION: calculate-utils-r5_src_install
# @DESCRIPTION:
# Install all modules of calculate utils
calculate-utils-r5_src_install() {
prepare_module_info
for MODULE in "${MODULE_INFO[@]}"
do
MODULE_DATA=( $MODULE )
MODULE_PN=${MODULE_DATA[0]}
MODULE_PV=${MODULE_DATA[1]}
S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
cd $S
distutils-r1_src_install
done
}
python_install() {
PYTHON_INSTALL_PARAMS=
if [[ $MODULE_PN == "calculate-client" ]]
then
PYTHON_INSTALL_PARAMS="--install-scripts=/usr/sbin"
fi
if [[ $MODULE_PN == "calculate-core" ]] && use dbus
then
PYTHON_INSTALL_PARAMS="$PYTHON_INSTALL_PARAMS --dbus"
fi
distutils-r1_python_install $PYTHON_INSTALL_PARAMS
}
calculate-utils-r5_pkg_preinst() {
dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-setup
dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-patch
dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update
dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update-profile
if use qt5
then
dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui-install
dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui-update
fi
}

@ -7,13 +7,16 @@ DIST calculate-client-3.6.3.tar.bz2 31616 BLAKE2B 83602a115d4761c4d0515da39286e1
DIST calculate-client-3.6.4.tar.bz2 31615 BLAKE2B eb5ab9d173d9c7ab1ff99cdb02e5a73f1d9566542d9f2c6cb8ce68de2dd83bbddb8f4702ccc0cf614373dacbe0abf83065c1be663382cd509a5ac319ceb068ff SHA512 634bf20193fff42bf1bc92d056ba3bf30bd9480cd3ee8ae5571f112cc436df00f9011570e02606551ae118ec270e9c0eb3cdc2b201c8ec6ca762e9a43ab790d2
DIST calculate-console-3.6.2.1.tar.bz2 24727 BLAKE2B 87884f5eb5d7cec5f488bc21d23c29e6e407fa0ca0ac7970fa2cd4eab48b664053f5307c50f8c933de6c746bbe6e77fe783872e11fcc9302878ce911371ef1b5 SHA512 d251f586c18ce6b968c7d626ae8d5120ea6ba81d7c49302c5da916b47ecc55130e36dad00edba088b4853c0d01b70099dc3ea160633f85dad78fdd0ade66bf39
DIST calculate-console-3.6.3.tar.bz2 24729 BLAKE2B b0c9d54b2a054323f009c190accca7d3a670bfb55683bc214621da00f127ad6c89d19457802ae8a52dda7e6e2059c8180584b8715a5b58cde07281d84e02466e SHA512 020f3de32dec180743907d04ccff16aac09578f218a0efb61c5ad7f3c4e1d302e01befa71b97cbdd6d916596ecfd9da5ad7a2d4f91507ec4f3c65dcf185d7a8e
DIST calculate-console-3.6.4.2.tar.bz2 24769 BLAKE2B 76b4b269c4d4665c9f67c032e679953be1bc7d403f4e5c414ac01d772f3bb6e7fd3e543919c3fd194828b85ec799b951b4f3797a101ca8796ae42f25e11c4896 SHA512 8583367288394101225d41361ff6b8b1bb239a01177b06f6c5fc93b7d7822d8408a682e8501ffc0bb68976b26ceeece51c9e0e2cb607dad6285a9cc30c3b6bae
DIST calculate-console-3.6.4.tar.bz2 24708 BLAKE2B ae242cea4c92edd9d2508e321314af4d3d49869bdb92c4441fad06b210f3e646fb02d19a0befabac83cf808a69917dc843cc56cf81e9e65397dceb4939a964c8 SHA512 21e8f15a3aed374dc2c376b115bd027cb647f27065f76ca5f3b9e0fba7c709266b5828f68110a37ef96f0271b408096d56831bcddd3ea7999ba6abf6e4c31c37
DIST calculate-console-gui-3.6.2.2.tar.bz2 414935 BLAKE2B 98201899734941942476763c7604fc486d0f2e14528ddba0e7ede0823ba1976f651b34ef6e0933395e2836badf7289aba22f2622910a49a99ad3b5d70106e150 SHA512 828b7e374591ea7749cc6e005e58b54ba8e0d261f4df10ed311a0c5068d7ec741e3f37f734ca5f4a95ec63c38d7db46e6dfa6a64a0552ed57b4023d8d7360637
DIST calculate-console-gui-3.6.3.tar.bz2 414893 BLAKE2B 709e6d62c1dac5a8b219ee775ca050c3067480c79e660dcbcdf826c0ae821fe82479e8d2633bfec0b242d6a9d96f3d00a5283fe9b2acbbcabbaa2a793bfad546 SHA512 6a0a3ed11d2e9756e4d39118aa1880a0a2eb1c7d296e88b953ba5aaac6648ab3e58bb9bc1f22ced4220b0630ae43b3974db1e7bf2fe957c0902605bcf5768966
DIST calculate-console-gui-3.6.4.2.tar.bz2 415267 BLAKE2B e4744b0a2eba89e517ca135605057d6a8dfa9b5d7ef647c0d605573b1f0adb2698c69d7f1f0075206a1566704fdf8f417c0f872e62c3f4d31271b74b5e0a893f SHA512 40c32aa2f6be599511f438a388982cecf10125e12fb9088e0e2406ff41f9874cfea54e648e5733474aabdf1a9aba52f92613575784a893f7ba09e3d5e3026acb
DIST calculate-console-gui-3.6.4.tar.bz2 414850 BLAKE2B ec1905eb97fe7f831bb3c6926eeb57e0bcd4a3e76635c5d2db416f79c2e2f8430bd5e99ce4a0bc1033e165c6c6faad1ecfa3a09739d578f1857823fdf6a36e0f SHA512 8f0125613cfce7e8bcd1bb879d49ce41d20893b0bc5c992ac367d88a2ce38042c33c4f160cc7ab24bd7c334621da5dcc27fd4f92747bda1063939220ee1e81ac
DIST calculate-core-3.6.2.2.tar.bz2 98038 BLAKE2B f3bbdf0acf868b7ef8ef2bb74bddb7b8ba5fcfcd692fc57fa4c3a7e9cd23c598baf03ad944aec74bb51dd8c605ad1508a8517293036622e1c9c60310480afe6b SHA512 ca9276f96ef91e8547af07cd00a078da777a9627e0e63e1ff6124a601fa44592d74ccf3036326d590c879a7485e5b28dcfa0eae14ae9ff13ae1f5e5aa7ac4cce
DIST calculate-core-3.6.3.tar.bz2 97800 BLAKE2B 0f619dbf826aefdd772f3fb73f6ca68e61cf5f66cde6f002c969ab8dc9dc2d58888e262f7ab7b70a516721ed9243c29f1c74ab620ad7d9256c89edf595740984 SHA512 d7fd40cbe75c0d1a338c92dc6416f35ca172b483405183bb47d798866534a234f26438e5a802508c11d87a072253202917c513e021256969d3ad12e2a203ef21
DIST calculate-core-3.6.4.1.tar.bz2 97895 BLAKE2B ef8995045add1fb345d10f8b8a1fd13a2684c8ffc3620408c91ae4a487c8dff9eaafebc2535ca74cbb47a51900d808a64d34958e6c98861a01a9b0a52d795f72 SHA512 3620fe55eeadc6a2242ca048d278774f35b640af0d535593f7d18002af540a4a19c27a85645480b3a7ca7a7421270f103bb653fdfdc76af282b3c8abd31e598f
DIST calculate-core-3.6.4.4.tar.bz2 97989 BLAKE2B 14b5b41c052032ead8cf8fdfb46304f29c8e3b5ce10afb4a9b34eb4c4f8b5f6d4463c4c9a999becb7e7bb9705a35171db9a24d8ab55cac66991e2f1bd034328b SHA512 14803479bf10cde25ae81881b3336869250293a5635e7f8f79bc7241d4708acbf155dec7f0aba260359f897880f919f38cf19bbe5ae1ed1a52bce9517e90f6f7
DIST calculate-core-3.6.4.tar.bz2 98028 BLAKE2B df26a27563d0617f88a31cd47cdf9b42961bc466cd5e24e1c3d4abdd7ecf3ace7ac6e1e1f40872739e58a981ddb5160b80ca5bfa1564e9efc463d036f04496bf SHA512 64009a6e08cd0dbce17ba691f6cf54dd0673a8faeca3b55d06818a9bd533ec71ec0262895dfcf9738ee0a02cc806fd18125ad1911165ef516cac05fa23f5a341
DIST calculate-desktop-3.6.2.1.tar.bz2 18577 BLAKE2B d52ed584f5f4c9e22257369e966153e3b317c7f31604bf8f13cb60d681e905b6b8c5d9a79bc2335dc13271d28d3c68ea0345557d269f5c77d6527b91e8b27593 SHA512 4a7c55948a5115879463543258d8afb4d7d35cea001a620b8cddd0347ac0d8da8de92206bc01de23554ab6fbcf2a25fa3bd71848fe03c46eaae5036abdb9ee28
DIST calculate-desktop-3.6.3.tar.bz2 18566 BLAKE2B 533379bface0a55d8b90851b523324dac4cba271bb14c38539d3f9b8a5018a1f91b2c010a94bc96d238c1288714427911ed1bc68df38f6ee4f9b97990109d08e SHA512 6a70d5a45cdb17d9f485e9716ce848f238694558b5f20680282e055e3dff928deb029a605dc5ebff09338ab0d1ba1ba0a73be301cf5caca936c51dc36f7948f3
@ -31,6 +34,7 @@ DIST calculate-ldap-3.6.4.tar.bz2 11922 BLAKE2B b41ac3fae239bca0936afc262d04c2d9
DIST calculate-lib-3.6.2.1.tar.bz2 203851 BLAKE2B f5777274aa7d4fd64549bff93b6cf5c76f16bc51636a007f9e098d75ce60ef2c37d14cfa8ce9940b602d03365f95caf7344f950726652e1420e3543aa79f7b3a SHA512 ae7d2b7202f1d9c1ac14b4624c18b7fc8358c6e69dc71f9bcaf529ddf2d19983f59977b72c30de62340129d61ec82898d53472010bb40d4bc55799ec54a01dc3
DIST calculate-lib-3.6.3.tar.bz2 204081 BLAKE2B 6ce75e91726bb689ce0c41a031a6273ce77105b7ac99c3eb72da7fc0b22171174c42f63822fc4e2932c4a9174cef192985fd0e2d52eca481e4bdbea9ee6c32ed SHA512 a1e3dc211f427df85e26b3cc5293e9697b879ec11c46f47261cae59acc45c334a5ce5ce3bb61a4595ba971065557275c6d50707584156c473826ecc62d37823b
DIST calculate-lib-3.6.4.1.tar.bz2 204356 BLAKE2B b65fa46764a31451a7da262b2124cfad48e0b2082a163106d1129b6733c0f966f10ddd1f7bbfca82edc2e6c645c446ba0dafb8c11cb3f859528ded8a39dd4d2d SHA512 253325d47a20e1c3df2a9cc13c299222fc56ef56af831b163de8c445df38be00fde86296bb86beb577456b17e952d5bbdcadf63b07f0e001de1b695f289eb8c5
DIST calculate-lib-3.6.4.2.tar.bz2 204204 BLAKE2B b762f75b7d6861ba5a31a310810cd52427bb5bb4bcdc7afcee60ff066767777644b978b225f34eeea972afd32df8a079b246d0136d149e18d0a6d1c99f31b845 SHA512 c0b7920467023ef395f3de700aeeb666e6f3afd8be0b88a20c4aa9841b66ecb4eec0a6e9f25b1b5bc6c61a667ff95c947a599b76fc43dd003e8839c81427dce0
DIST calculate-lib-3.6.4.tar.bz2 204251 BLAKE2B d1b490bf80ad215515f96bb3f5a3a48bb0ed5c18c0f68c32a066a5eb29e49f288ccfb3fa658a0cae2231c4b0ef06312f5ce67c4f5d0d02ad1feba639fee68f1d SHA512 0652efef615cd58b0b445e7240ccb19baf028186ffa96b50d9a028353e1fe018b7466eaf4961c552dcf611e699b63210a4a123074f271af4ec8405ac43e07df5
DIST calculate-server-3.6.2.tar.bz2 6624 BLAKE2B cf1a6779578c52f153f463b9987a5847aacb4e3f59f8f456c258f8aeaff8d084d8c08647cca034c38006930a2eb2cd5046ca55ccc7038408e98d1150cb26d92e SHA512 44296987b1e04e477365fbe51a8396bcc0c542cd105e27d2ca9f4b06dced35ae0c0ed85fa216516760c29ec565d56bfe6acafc279fbf6049267f602caa4883e6
DIST calculate-server-3.6.3.tar.bz2 6683 BLAKE2B e979f47137316d0bafd7aa8a6ddd1a6029aff03803ee990d0c0c4273a221e05964365b96dbbcefb603e69d579639b382941754eaf429c45c9f8cb91bba46c1b2 SHA512 d1632ff43ecd7db7f9138d2f0c85b3906eb38d342f14b5fb3201decdea88d673f93d11707259c07bb3c57d03828efc7e779b638b48434a6e026d4e8c13fc519f

@ -0,0 +1,24 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
declare -A CALCULATE_MODULES=(
["lib"]="3.6.4.2"
["install"]="3.6.4.2"
["core"]="3.6.4.4"
["console"]="3.6.4.2"
["console-gui"]="3.6.4.2"
)
inherit calculate-utils-r5
DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="x86 amd64"
Loading…
Cancel
Save