From e72ded9150c9977974dd34ad73dae34ae364e18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 2 Jul 2021 10:59:56 +0300 Subject: [PATCH] =?UTF-8?q?sys-apps/calculate-utils:=20=D0=9D=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Перенос console-gui в python3 --- eclass/calculate-utils-r14.eclass | 16 - eclass/calculate-utils-r15.eclass | 315 ++++++++++++++++++ sys-apps/calculate-utils/Manifest | 6 +- .../calculate-utils-3.6.10.1.ebuild | 1 - .../calculate-utils-3.7.0.ebuild | 24 ++ ...ebuild => calculate-utils-3.7.9999.ebuild} | 8 +- 6 files changed, 348 insertions(+), 22 deletions(-) create mode 100644 eclass/calculate-utils-r15.eclass create mode 100644 sys-apps/calculate-utils/calculate-utils-3.7.0.ebuild rename sys-apps/calculate-utils/{calculate-utils-3.6.9999.ebuild => calculate-utils-3.7.9999.ebuild} (72%) diff --git a/eclass/calculate-utils-r14.eclass b/eclass/calculate-utils-r14.eclass index 27510aae9..8970b9638 100644 --- a/eclass/calculate-utils-r14.eclass +++ b/eclass/calculate-utils-r14.eclass @@ -60,7 +60,6 @@ declare -g -A CALCULATE_MODULES_=( ["update"]="$UTILS_PV" ["desktop"]="$UTILS_PV" ["client"]="$UTILS_PV" - ["console-gui"]="$UTILS_PV" ["console"]="$UTILS_PV" ["server"]="$UTILS_PV" ["ldap"]="$UTILS_PV" @@ -69,7 +68,6 @@ declare -g -A CALCULATE_MODULES_=( declare -g -A CALCULATE_MODULES_USE_=( ["desktop"]="desktop" ["client"]="client" - ["console-gui"]="qt5" ["console"]="console" ["server"]="server" ["ldap"]="server" @@ -230,13 +228,6 @@ RDEPEND=" >=sys-auth/nss_ldap-239 ) - qt5? ( - dev-python/dbus-python2 - media-gfx/imagemagick[jpeg] - dev-python/PyQt5-python2 - dev-python/pyinotify-python2 - ) - dbus? ( dev-python/dbus-python2 ) @@ -325,11 +316,4 @@ calculate-utils-r14_pkg_preinst() { dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update-profile dosym /usr/lib/python-exec/python2.7/cl-console /usr/bin/cl-console - if use qt5 - then - dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui - 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 - dosym /usr/lib/python-exec/python2.7/cl-update-checker /usr/bin/cl-update-checker - fi } diff --git a/eclass/calculate-utils-r15.eclass b/eclass/calculate-utils-r15.eclass new file mode 100644 index 000000000..d5bb4c0af --- /dev/null +++ b/eclass/calculate-utils-r15.eclass @@ -0,0 +1,315 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# @ECLASS: calculate-utils-r15.eclass +# @MAINTAINER: +# support@calculate.ru +# @AUTHOR: +# Author: Mir Calculate +# @BLURB: Functions for calculate-utils +# @DESCRIPTION: +# This eclass use for calculate-utils ebuild + +DISTUTILS_USE_SETUPTOOLS=manual +PYTHON_COMPAT=(python3_9) + +inherit distutils-r1 eutils + +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:=$(ver_cut 1-3 ${PV})} + +declare -g -A CALCULATE_TARBALL_=() + +declare -g -A CALCULATE_MODULES_=( + ["lib"]="$UTILS_PV" + ["install"]="$UTILS_PV" + ["core"]="$UTILS_PV" + ["update"]="$UTILS_PV" + ["console-gui"]="$UTILS_PV" +) +# ["builder"]="$UTILS_PV" +# ["i18n"]="$UTILS_PV" +# ["desktop"]="$UTILS_PV" +# ["client"]="$UTILS_PV" +# ["console"]="$UTILS_PV" +# ["server"]="$UTILS_PV" +# ["ldap"]="$UTILS_PV" +# ["unix"]="$UTILS_PV" + +declare -g -A CALCULATE_MODULES_USE_=( + ["console-gui"]="qt5" +) +# ["desktop"]="desktop" +# ["client"]="client" +# ["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? ( + >=sys-apps/util-linux-2.19.1 + net-misc/rsync + dev-python/lxml + dev-python/pyopenssl + dev-python/cryptography + dev-libs/openssl + dev-python/m2crypto + dev-python/pytz + ) + gpg? ( + app-crypt/gnupg + app-crypt/openpgp-keys-calculate-release + ) + >=dev-python/pyxml-0.8 + sys-apps/iproute2[-minimal] + sys-apps/pciutils + app-arch/xz-utils + + app-eselect/eselect-repository + >=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 + ) + + !=sys-auth/pam_ldap-180[ssl] +# >=sys-auth/nss_ldap-239 +# ) +# +# server? ( !sys-apps/calculate-server ) +# backup? ( !sys-apps/calculate-server ) + +DEPEND=" + dev-python/setuptools + sys-devel/gettext" + +#REQUIRED_USE="client? ( desktop )" + +# @FUNCTION: calculate-utils-r15_src_compile +# @DESCRIPTION: +# Compile all modules of calculate utils +calculate-utils-r15_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]} + if [[ $PV == "3.7.9999" ]] + then + S="${WORKDIR}/${MODULE_PN/calculate-/}-${MODULE_PV}" + else + S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}" + fi + 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-r15_src_install +# @DESCRIPTION: +# Install all modules of calculate utils +calculate-utils-r15_src_install() { + prepare_module_info + for MODULE in "${MODULE_INFO[@]}" + do + MODULE_DATA=( $MODULE ) + MODULE_PN=${MODULE_DATA[0]} + MODULE_PV=${MODULE_DATA[1]} + if [[ $PV == "3.7.9999" ]] + then + S="${WORKDIR}/${MODULE_PN/calculate-/}-${MODULE_PV}" + else + S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}" + fi + 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-r15_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 + #dosym /usr/lib/python-exec/python2.7/cl-console /usr/bin/cl-console + if use qt5 + then + dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui + 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 + dosym /usr/lib/python-exec/python2.7/cl-update-checker /usr/bin/cl-update-checker + fi +} diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest index d54ad659b..6bf3f4874 100644 --- a/sys-apps/calculate-utils/Manifest +++ b/sys-apps/calculate-utils/Manifest @@ -17,15 +17,16 @@ DIST calculate-client-3.6.9.tar.bz2 33720 BLAKE2B b79557317dbf0f958859c07d40d8a1 DIST calculate-console-3.6.10.1.tar.bz2 28372 BLAKE2B 622690a9a661e2d19b442c18b829c921e0797c6ee4e3683b3048556a001cb22a601b47267992c6e137cbd62f7f1ae0871f2e25028fbadda8e049cb85ea98d9ae SHA512 12424b426774bd7d0953707c66f41f84f52dbb7d5958f67e6476ebfee8d7aca30c6fa2c8bae44831590ae462925397bcc7e6802be04b8e36030078fbcbdf7a04 DIST calculate-console-3.6.8.tar.bz2 24777 BLAKE2B ae2a75832940a91f7dc169493269b736fc53f41f61bf0b62ff16be3cbbf0d4732a90e8a5f4d1574a64fa7701d266b2ee6f232946fb777d08db7cdf545580dc34 SHA512 4917a2662fed949c07c039721d9aba1cfe46171dfe942894c6d1811f26be278c20629e20586fbe1d3b2b374089e51ca68c104a7b80c2fd4d55d49f0f3f17ee7a DIST calculate-console-3.6.9.tar.bz2 24744 BLAKE2B 5e3d4ef8ae89a24aef15d3498b163555e519b5c6ee4ac3375380c04271fbbbfc4a05620395fad2228d5cb3b3165ece51976ab1a415f426901a3b57153bff4889 SHA512 c9d62161683dcfdfcbb9e0301d16d4ff595f41d270f7dc2f965652f625c29b3d1d8217d664ba109bc7d6ed1eefacf501010379bd6d70c017aadab7df71f86ab6 -DIST calculate-console-gui-3.6.10.1.tar.bz2 419572 BLAKE2B 16dd6dffe84b2dc924e86383f59dfe2d14f5c9ab5652eef3909868b854a5c1aa5f7646823377b97c53d77e83d602c4283da3fd7dd5a76e1ca702bd529db6e6a4 SHA512 5ffd38eec3b9314934570aff261d0bdb3e2490f956f5ee800d7fef8ecf312c49fd9a293e39faa2c957ea4cfffc70ddd1fa6a17d04543df96c7240514b92146e1 DIST calculate-console-gui-3.6.8.2.tar.bz2 416011 BLAKE2B 831ebcd23414feaf2735c040b0de9fd0a546ca661a6ac043aeb1c4ed8390fc711c5df63551024fb3d57c73acbfae6ca475e534d15e47f24b15af083114ff84e6 SHA512 841be8720f88b53c39018af2ee2e4523e4d60bd804590421f891b20becd32233b043afffc625a8c6f19aed5ae563dee5019fc5d780d5954834da5e4c4787d6d9 DIST calculate-console-gui-3.6.8.tar.bz2 414915 BLAKE2B a58033e66144fd9a7808210c32d16e1cb1e5ee8664f2d331f0ba803d64f36db956694c78922db9093fcc46f442eac029d4fbcf880dec10bd863d428eff56c2d1 SHA512 6ff64cb511adbcdafbc48854d43a250bc27fb6a8bd36bb74a4edd37453b6bb3335b7ec8860e52acb7902a50a791cd354cbdf3a45e2710e4833be23ebcb7d3c5e DIST calculate-console-gui-3.6.9.1.tar.bz2 415274 BLAKE2B 0d35bf404d993730479bcd10e9033f8d52800a7bbead1f6ccd66e8f511344e854a63c1ff880901c7de87b271df611f9e1890cf837c159dd399169f30eb81265f SHA512 3ae34483ca08f7819835eef8158468996021c1ece9f354d5371f617a1992034e778d8bf0a025463d63ca70a7fd03ef9be06dc4619d7fe1c45ac46d8a43ff0106 DIST calculate-console-gui-3.6.9.tar.bz2 416015 BLAKE2B ee8497a40f76736683ec6536a27383f4ea44665fb2f4c6ffecbb3f101ddbf182acc0f94c9679d20d71f36da5a13251a1809c978920814f297c0209f497f7a04f SHA512 2371c93283ad84b08c7c9f2dc860bd85453edd5183bdf090ed054105b395b913f02e1708a68b6ab5afe4afdc5dead4819cdb51cf91cc9ee57fb5c9a6fa4ccefc +DIST calculate-console-gui-3.7.0.2.tar.bz2 1552325 BLAKE2B f2c1ec112fa19e83bf1f9e2738909a3efeef88654720ee1cfbe851204b767d7d4215ab7eccba85ef2d0304deeadffaf9f68b6ad6dcc351eda8d969d195e43df7 SHA512 8be7f1a9869e56a9e17a33346424253f43855b36a5f316a4321515243a01206c6911e5af075ee908b184903ac24d83722954563e22afefcdb777374062db5a83 DIST calculate-core-3.6.10.2.tar.bz2 100402 BLAKE2B fb278b776cf3c1a273974135bc90974f5c6b37e1557eaaa897d136ee3b35bc70c4510adef88150ae2a4974572e170e2d03015e408146ab2fa9b85ad83836a506 SHA512 ced3d125e3a01c0251a65b2844b9058f9833764a48a726b00013db04d905ce65e5923b38b1c6b56e4a536eabd52af917e9771dcb3a27e93c2c0b6bf3c5626f10 DIST calculate-core-3.6.8.3.tar.bz2 99184 BLAKE2B f6f1d4ae400fa06974a2d4590c7238a6f240372f85dd756ed022e8478238e53e6bb84c479e2837e58318c1afc7dea69c453cd52b02ce2ea88bf82a5fa0a0e1dc SHA512 398308ec7083aa1802cb7d5372c3b25ad91090a07f19c6442a20b2112961a487f8047476ccc97f7999d9c00f863621550879ad4c82649b456389a24e0b3b8e1e DIST calculate-core-3.6.8.4.tar.bz2 99049 BLAKE2B a1bdd9b9210bafec3673251daedb8fbdc58937c56b730e1d88f9461f34b2edc20b5e7fdf7d43cbf5d8df29dbc2870f6db602d4159cced47521c2f4e4d0bc855c SHA512 242c27fdee0cdfc780fca88c1c327e37c2049d92e610d29bb8078644c9aa251770e3894296538f593ed520e109737695c64edac56534ff12402f6d9fda486c3f DIST calculate-core-3.6.9.tar.bz2 99169 BLAKE2B 0ccb5ad09fce632d2b6c45c4ff807ea167e4c2de32245f5ad9d521b647e859ff2e3a7c4ff3d5260d250c3ceed5a1476006be924db3f974a0f7a12a90b83bae6e SHA512 b98dd9559c94d8f4397bcda1dbc45bfd3a567070f818be1f030c3ebec00096f8b70de16cdcbf24371a7e879645a7ea3d5fd6a6cc3409f9a08788de8ba5effb0d +DIST calculate-core-3.7.0.3.tar.bz2 100692 BLAKE2B bf95171f1ebb610b4fba03684eeff8fda6e80ea720d1a1111f01bde786246fbadb2f8bf073051f8e78794676ea1947987847674009a754b15aa1aca903ddd312 SHA512 134371bb260caa19a01d8f46a24230d64f87b7900e03b6f01ab28435f60b3c9b63868f2c56711c56fc4ce25de591243603737b4e6aed0ab94b0f3586247483e7 DIST calculate-desktop-3.6.10.tar.bz2 19887 BLAKE2B 90dfc921c5d5c55255dd2c286f45cce079b33fe16cb4ae8af0953c8fc05db8a1ca8a5134c5c20f5c971ff934256abaf0e2009dfef358be570c2211f12e05e3c8 SHA512 ac04196e738d32524e6c080a8649b78d73d012853f426059ea4b96fcc521bfd5964015838f1a2c20ce8866d7f1ff410abcedd0a9032537be035eb20a38ea206c DIST calculate-desktop-3.6.8.6.tar.bz2 19026 BLAKE2B 98be46d6246c6402b65cc800a2618b80b95cc761931bc19fe146347a1ef29e7a19597f559d47823c3d8200b4e1cfb9355d2d95f508e726ec1b0550578a600951 SHA512 cd0f44855f4ec0ca402ed2d952677b6c065811d2d31a1a65c0b025bccaa0bfc31e4e692658cd4ae25b4325660f58b712953ab50ca90d422446a9fab154ff386f DIST calculate-desktop-3.6.9.2.tar.bz2 19899 BLAKE2B 6fe164172826f599d998625273a8edaf7c9d63729463caa4468ed6cba818f8f1f266006af86a7f39be745d4977622404cb8ec53db70eaf26f8d41a4d2da4a83f SHA512 24836a2789f5515953e97a56c242d5638f242ad407ae1cc437df670b574751bede79599651ad9beed05c51e3cd83c7fd42a049887fe67c109b55aedb705f8421 @@ -59,6 +60,7 @@ DIST calculate-install-3.6.9.7.tar.bz2 85145 BLAKE2B 4304274f8d2f833eb3a8cec1185 DIST calculate-install-3.6.9.8.tar.bz2 85253 BLAKE2B 21fb7826347be75324c5e9badd9b22f750fb3d96ab23081a4418754b2117486f9a7c1a0d09a06d8605125fa26b96ecd564527e0b829325218ee71b4746a05d27 SHA512 83f6e74d8821060f1ad25bec77e8e5c2a5d48268cc13cfc225914e01f90fc86713be78ab630f5bbdc1f9ced8dfd1177c2e44f921c52b011d81b78372d173860a DIST calculate-install-3.6.9.9.tar.bz2 85078 BLAKE2B 075a955f3a00f4cd17cdf7ba6e54b08b4bd40dd379b469746a773fa486599d490c994a12dad54aabfe257477afbbc491eecae19a1fbcaf7b41132e605a0efe15 SHA512 a818836806cba301914325d04c620cc5be4fa8b75905c560e504d95046026e4c9d4d16554fac5023a5877c1369c877aba9e4f622cbe2b414c690aa866a5af9e3 DIST calculate-install-3.6.9.tar.bz2 84889 BLAKE2B d68ac321dad7e3d275fe97a82a1466ada9a621a80ad36648543687959c51e2653699cde0e1f160fab1e6d2a058f2e52eccc144d1f16aa37cdc43290bedfd4be7 SHA512 127acaaf600f0f06798a418857523af966c9b71532490b1bc3ded5e371a831a3657c7dfe7958d7f4f7ce2aae9255ef854446823cd01bdc604d2401ead5e22eaa +DIST calculate-install-3.7.0.1.tar.bz2 85735 BLAKE2B 10e9e0164c7b0ce16f3c71e029def01f17865a48131fb1bd3d0bc83e802beef96933d4c86bb235f9efb4f62e88ed14b1fac1fc17e6ce3787cb4aa1db35c5cabc SHA512 715114caca005c046cf306bfe7e6b4fdedd60283640bcd2473c9b5fb55b09e2a55fb5883c80a85aa651422fccd69770e1b5173d6b1d2787a33a8771d1206c6c1 DIST calculate-ldap-3.6.10.tar.bz2 11902 BLAKE2B a470899c842c036880fcd3333b3797a26981d05bc635d0b6be3c0adb81192e221e82033a778dfc226134ea2f0136fec5e63d86c36e143497b152fcc5b9b12f5d SHA512 5b080add15a5fdec4625d3f12f565f2cb5b7d14d7029284f27e731bcff98e8c15b1c5e90612740148c7b2263382936e317d0e61d5b58f9a381a8ecdebd591196 DIST calculate-ldap-3.6.8.tar.bz2 11923 BLAKE2B 473714789c6583bf577dca15cc60c125e6ffdb0f8d1fdc14e33209fc76540c380552cbd2064d97ce6c36fd3009b0acfd628360a09006c4a96fb14a735eac53f1 SHA512 aa84559b6571367946b46ad708a9dcad49afc92ad7d2cbf4e24d9665d4482007d66f80e39e988ed7ab79f2da367ca27923fe88ed3918ef4d82fe9493a438beaf DIST calculate-ldap-3.6.9.tar.bz2 11928 BLAKE2B 1e1d48e72b2775833beefa3b5f17d7f37247ce5906504565aaa197e429f9a014310b9294e1b475e24797941e27ee4520d030052f79de32362aebb66cfda706fd SHA512 fa7e42fb9ee01049c48659a796b08be4b5d4c5f63106655798e96c1662159b54776522fe9cde96df0c7760b01832c1fa758e4da014bb14b9aaaf9bb1a5de84dd @@ -74,6 +76,7 @@ DIST calculate-lib-3.6.9.6.tar.bz2 618601 BLAKE2B fb04bf4cedaa62931d5e20996ff109 DIST calculate-lib-3.6.9.7.tar.bz2 618558 BLAKE2B 27ca4aebdc6dd6f01b0617b3f977c07ec645e3587867cdaefb0ad8f009aeaf800150ae3c6b3f9cbda4b0fc3815e228130ac1799f59f8d687567fbb49c1bb63b5 SHA512 67ce3fc0acd6bb3177f01a942a462c0ac97f70fb4b9020b0daa3fa6af8fddc4432f1b3f6e9b97e1ae5175afb60e7d5b150e0e42efdc847a09734df0de8160452 DIST calculate-lib-3.6.9.8.tar.bz2 618666 BLAKE2B 1d11d4347e1698e09ac2d36b4f0a6c7a157da1b37e8dd3eb9971c6fa67490190b1992a50f05165206d32e3df9fc923537eacaef5ae11833ed264489446964d41 SHA512 a321cda4bed56ee3a4e42f1be7d711e18af4c9bc417ded030a22bf0eca6acbc82488e855d589b5443da6eec770a55f89422625803655cf1f65ea63ac85ac58b8 DIST calculate-lib-3.6.9.tar.bz2 618228 BLAKE2B 830804476c7f03f50702dc271f6fee6d6ce8eee9420c483cd179fd097a681a3f4670875d9126b929b6b83ea85527334ce84b58fe9d60d4be712303f19d0e9854 SHA512 2f6281392ca7ec360fc008c77b0da508c40a43337756b7bf0d2f8275b50da40f023e863d3beb6adf157a7520ba83943d4d241a208aacf74eebf5125aa972eb48 +DIST calculate-lib-3.7.0.3.tar.bz2 1339104 BLAKE2B 046fd3f80a82d318ec694a4c07eff14cc501694ac4203cdf2b7cdbd0c32059d4d28670a07c34c18d83e63ad5523fffcd1ff0d41134803411c51d81b3ed076f1a SHA512 4c7a485fcb63536cc3fe2d2c2a95b9318167add07ca225bebb87ac6348f18cea8082c7fece2e1234f259b55174370784f9a3e0cb12f167ec706de320d5212a69 DIST calculate-server-3.6.10.tar.bz2 6623 BLAKE2B c405c17d10460e9d7d22f15f001038092bbe944595787f9be7f73a2706529a749a616a3be21e4896c8c02add6a167246316530ff7800c586473024c24e757b4c SHA512 1ea2806e1a26af2c6ee8338c2e1e3044b3116fbf2d81aea8c26384eafd68d915a06a4d7e9237f2d358355c8b849298353d63145d5094aea1b47fdc403ff97693 DIST calculate-server-3.6.8.tar.bz2 6646 BLAKE2B e8900478cac290c3d3de491e505ea1b691907dbf3b37d959177e191d89360d52e1a4c46cb2e6be4f629aad2ae34c81b3372c47805c2842f766540af86103b039 SHA512 e88163b35a868295cb16a485dbe8d0eb50f11eb67ee34e02d3b27dccb394887cb9448e124767caaa3fefd2776b9e3ae5e31a9ec7af74d5da81635386f7a6ea7b DIST calculate-server-3.6.9.tar.bz2 6633 BLAKE2B 7ca41b527a11c4178dbd104bf2ca083cc4441bf656c8991928a7ad07478a50bae4b561ea132cd4c00947e360f48568cdc05bb93db2c9542877ba6b105e56246c SHA512 26d010cd45b64576894b2ba9961223181de5bc58eea0641e751d456c01c7b9f60e3f13223f445b017d39f250fde4d003be19f459ae61b6f05510593b38f1f492 @@ -87,3 +90,4 @@ DIST calculate-update-3.6.8.tar.bz2 38159 BLAKE2B ee6cea1dda68f85fed80a800754613 DIST calculate-update-3.6.9.1.tar.bz2 38512 BLAKE2B 64bdbfac54cbde6f19971ed07f60b12a242779e84019c6038e63f025b00cc0ed8cb15ce9dcb52ba3af6ee7fca764e41f1d8aa24768c6c9a11d41594ff1855773 SHA512 477a5753912749ae320c52f7d295d8103d21dfa40fe1ca67d0b41f9144d7f4384110c8e6dac692b8bfa487d8d99232257c045a2f008a29d90f147ff577b2e62e DIST calculate-update-3.6.9.3.tar.bz2 38559 BLAKE2B 2f284a656739e4333724a4ed8a088fc8e668c191ec9e1668ed6dae81bcdebfd68b3d08f41763fd38af0c6f509bfbacf1f94a0d997146e26633dd26a39b414580 SHA512 7bda39fb52369a37f45c4ae58c4d480e765cfa994008487cadc8f828934f61c35bfaf1e7fb88cc22c7490b85b811fbb4075e36cdcdc435a84074e4317d586500 DIST calculate-update-3.6.9.tar.bz2 38403 BLAKE2B 72668ddd63d8c5f1f0f4138fcbbaa01412a86548c86cd5e3d644e00305bc7ad464be33b3afac374e63947814ddaf545d7bf6092fe8ec28b58cb6277bb682e101 SHA512 03c4950dde1999360d2a9a85c1b20855fddb853fcb26b32cedef3a551cf9fd6af600db453acdc4f9ae1af0d2751907786b804347c0ee84dab5812f609f93b46d +DIST calculate-update-3.7.0.1.tar.bz2 38592 BLAKE2B f51c9bc6b5eafe43ab6b54185c9ad27d910f215093e61a3975a6f4f482925c64b05e6c1e0ea9996009f53759195301de58f71b7619e4102aac8f5d9844293bf6 SHA512 946ad6f273238a9c916e340c60579db18c6da1d6282876a3a9ab49395705339ae82c42e2385777a6270d77757e5b463e4adcd879e21bf8f28d908aef67a85e19 diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.10.1.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.10.1.ebuild index c8fc46822..5f7f499fe 100644 --- a/sys-apps/calculate-utils/calculate-utils-3.6.10.1.ebuild +++ b/sys-apps/calculate-utils/calculate-utils-3.6.10.1.ebuild @@ -9,7 +9,6 @@ declare -A CALCULATE_MODULES=( ["core"]="3.6.10.2" ["i18n"]="3.6.10.1" ["console"]="3.6.10.1" - ["console-gui"]="3.6.10.1" ["builder"]="3.6.10.1" ) diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.0.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.0.ebuild new file mode 100644 index 000000000..117ccb464 --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=(python3_9) + +declare -A CALCULATE_MODULES=( + ["lib"]="3.7.0.3" + ["install"]="3.7.0.1" + ["core"]="3.7.0.3" + ["console-gui"]="3.7.0.2" + ["update"]="3.7.0.1" +) + +inherit calculate-utils-r15 + +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.7" +KEYWORDS="~amd64" + diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild similarity index 72% rename from sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild rename to sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild index 1ea8e586e..e32813e6c 100644 --- a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild +++ b/sys-apps/calculate-utils/calculate-utils-3.7.9999.ebuild @@ -3,9 +3,9 @@ # $Header: $ EAPI="7" -PYTHON_COMPAT=(python2_7) +PYTHON_COMPAT=(python3_9) -inherit calculate-utils-r12 git-r3 +inherit calculate-utils-r15 git-r3 DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade" HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities" @@ -20,7 +20,7 @@ src_unpack() { for MODULE in "${MODULE_INFO[@]}" do MODULE_DATA=( $MODULE ) - MODULE_PN=${MODULE_DATA[0]} - EGIT_CHECKOUT_DIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate-linux.org/calculate-3/${MODULE_PN}.git git-r3_src_unpack + MODULE_PN=${MODULE_DATA[0]/calculate-/} + EGIT_CHECKOUT_DIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate-linux.org/calculate/calculate-utils-3-${MODULE_PN}.git git-r3_src_unpack done }