diff --git a/profiles/default/package.keywords/default b/profiles/default/package.keywords/default index a34657d94..d4b03e91e 100644 --- a/profiles/default/package.keywords/default +++ b/profiles/default/package.keywords/default @@ -37,7 +37,7 @@ ~app-office/calligra-3.2.1 amd64 ~app-officeext/languagetool-5.1.3 amd64 ~app-office/kexi-3.2.0 amd64 -~app-office/moneydance-2021.2006 amd64 +~app-office/moneydance-2022.4058 amd64 ~app-office/wps-office-11.1.0.10161 amd64 ~app-vim/vim-tmux-3.0.0 amd64 ~dev-java/ant-eclipse-ecj-4.5.1 amd64 diff --git a/profiles/default/package.keywords/games b/profiles/default/package.keywords/games index 66b676b81..a95f2eea2 100644 --- a/profiles/default/package.keywords/games +++ b/profiles/default/package.keywords/games @@ -434,7 +434,7 @@ ~games-simulation/lincity-1.13.1 amd64 ~games-simulation/lincity-ng-2.9_beta amd64 ~games-simulation/micropolis-1.0_p20180313 amd64 -~games-simulation/openttd-1.11.2 amd64 +~games-simulation/openttd-12.0 amd64 ~games-simulation/pmars-sdl-0.9.2e amd64 ~games-simulation/searchandrescue-1.7.0 amd64 ~games-simulation/senken-0.3.0 amd64 diff --git a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css index 460903315..0778c83b1 100644 --- a/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css +++ b/profiles/templates/3.6/2_ac_install_merge/x11-themes/gnome-themes-standard/Calculate/gtk-3.0/gtk.css @@ -256,12 +256,12 @@ panel-toplevel.background button:checked:not(#tasklist-button) { #?pkg(xfce-base/xfce4-panel)>=4.16# .panel button.flat:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; } -.panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3; border: 1px solid #1b1f20; } -.panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3; border: 1px solid #1b1f20; } +.panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3px; border: 1px solid #1b1f20; } +.panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3px; border: 1px solid #1b1f20; } #!pkg# .panel button.flat:active { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; } -.panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3; border: 1px solid #1b1f20; } -.panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3; border: 1px solid #1b1f20; } +.panel button.flat:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; border-bottom-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.779451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.779451); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); background-image: image(#252726); border-radius: 3px; border: 1px solid #1b1f20; } +.panel button.flat:checked { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #1b1f20; background-image: image(#25292b); box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; transition-duration: 50ms; border-radius: 3px; border: 1px solid #1b1f20; } #systray-6 > frame > border { border: 1px solid #1b1f20; margin-top: 0px; margin-bottom: 1px; } #systray-6 .horizontal { padding-right: 4px; margin-top: -1px; } #pkg# diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini index 175643e3a..132321376 100644 --- a/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/0-ini @@ -2,4 +2,4 @@ [overlay-calculate] # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system -remerge = 20211018.1 +remerge = 20211024 diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211024 b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211024 new file mode 100644 index 000000000..e8c6c2fd3 --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2021/20211024 @@ -0,0 +1,4 @@ +# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=x11-themes/gnome-themes-standard + +[overlay-calculate] +remerge = #-cl_pass_file-# diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest index f0b2d65b4..6aa80b1a9 100644 --- a/sys-apps/calculate-server/Manifest +++ b/sys-apps/calculate-server/Manifest @@ -5,3 +5,4 @@ DIST calculate-server-2.3.4.tar.bz2 238318 BLAKE2B 302b00475f3a6ff3edc2f188a2fea DIST calculate-server-2.3.5.tar.bz2 238118 BLAKE2B 859254831388dcf1e3f354801a9cc10e46e3aae179640b55be38efc16078819c445fa1db3a4b8d177674a747176d658fa0d424f50b136fe0393fce89690798de SHA512 a1d6aca2c8f86c22b31309a7c2dd959485a39fade05c927720aa439c03a0d092953680753c1df5ede9952d3cdce7a48c9e4955dbea4d4078b28867dd33085e36 DIST calculate-server-2.3.6.tar.bz2 238163 BLAKE2B bf8d37cf6d639efcae8354fbd2745273694ad9885b1a7dcd0cb7b30647290a29c8f2688929c5af48d9524f6041ec8ca46a7624b5110af20b7954d19a5889913c SHA512 d6de8b5977f161d0656b4b21e6ed8ed97713b1724f6ba6689348b04b2f1ccf1abffa3ba12ac923dc436514b7c798fa5e6eff9abe203ce92eca24b01c35098129 DIST calculate-server-2.3.7.tar.bz2 238191 BLAKE2B 0d31473ebdca8255924ffbe3f132a13ac45739cdd638abc6e812900b5f7d6c80b622b273d2bf2492ca10d8506b20f9d120cfe6cab53f60360d0186b530c74b64 SHA512 c8b3b5d76ca0320eac2b416e21c8a11b9094f9437a71372a0382066181e2e2b836d31bd837dee87a9c8c4492d547aff870f4b26115ae766b17d67391e7766c4c +DIST calculate-server-2.3.8.tar.bz2 238546 BLAKE2B ef2e07b2967406dbae66422650f3d60ff8b233bd302622670dc7933cf158ffa28cecab6080d2cedee9a13eea008d2032f36a615b98ebd24c0d8cf88bc86fcdc9 SHA512 6434263139651e68ab0d2869cbafeed31f1bb4bb595806509d5b45fa283f59665c2a3fe7b7ad7a5f7eb22c2e7dfa756eda45faefe3e87e999632852df0645e2b diff --git a/sys-apps/calculate-server/calculate-server-2.3.8.ebuild b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild new file mode 100644 index 000000000..7ef55dfb0 --- /dev/null +++ b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=(python3_9) + +inherit distutils-r1 + +SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2 + http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2" + +DESCRIPTION="Configuration utility for Linux services" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64" + +IUSE="calculate_nomail +calculate_nodhcp +calculate_noftp +calculate_nojabber +calculate_nonamed +calculate_nosamba +calculate_noproxy" + +DEPEND="!sys-apps/calculate-lib + acct-group/ldap + acct-user/ldap + >=net-nds/openldap-2.3[-minimal] + >=sys-auth/pam_ldap-180[ssl] + >=sys-auth/nss_ldap-239 + !=net-fs/samba-4[acl,client,cups,ldap,pam] + ) + ) + !calculate_nomail? ( + || ( =net-mail/dovecot-1.2.0[ldap,pam,ssl(+)] + ) + >=mail-filter/procmail-3.22 + dev-python/pymilter[python_targets_python3_9] + >=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl] + ) + !calculate_noftp? ( + || ( =net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd] + ) + ) + !calculate_nojabber? ( + || ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap] + >=net-im/ejabberd-16.04-r1[ldap] ) + || ( media-gfx/imagemagick + media-gfx/graphicsmagick ) + ) + !calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] ) + !calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] ) + !calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 ) + dev-python/python-ldap[ssl,python_targets_python3_9] + dev-python/lxml[python_targets_python3_9] +" + +RDEPEND="${DEPEND}" + + +pkg_postinst() { + if [ -d /var/calculate/server-data/mail/imap ] || \ + [ -d /var/calculate/server-data/samba/win/profiles ] || \ + [ -d /var/calculate/server-data/samba/unix/profiles ] || \ + [ -d /var/calculate/server-data/samba/win/netlogon ]; + then + ewarn "Data found in directories of previous version calculate-server" + fi + + if [ -d /var/calculate/server-data/mail/imap ]; + then + if ! [ -d /var/calculate/server-data/mail~ ]; + then + if mv /var/calculate/server-data/mail/imap \ + /var/calculate/server-data/mail~ && \ + rmdir /var/calculate/server-data/mail && \ + mv /var/calculate/server-data/mail~ \ + /var/calculate/server-data/mail; + then + ewarn + ewarn "Data from /var/calculate/server-data/mail/imap" + ewarn "was moved to /var/calculate/server-data/mail" + MAILUPDATE="TRUE" + fi + fi + if ! [ "${MAILUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/mail/imap" + eerror "Please manualy move /var/calculate/server-data/mail/imap" + eerror "to /var/calculate/server-data/mail" + fi + fi + + if [ -d /var/calculate/server-data/samba/win/profiles ]; + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/profiles/win ]; + then + if mkdir -p /var/calculate/server-data/samba/profiles && \ + mv /var/calculate/server-data/samba/win/profiles \ + /var/calculate/server-data/samba/profiles/win; + then + ewarn + ewarn "Data from /var/calculate/server-data/samba/win/profiles" + ewarn "was moved to /var/calculate/server-data/samba/profiles/win" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/win/profiles" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/win/profiles" + eerror "to /var/calculate/server-data/samba/profiles/win" + fi + fi + + if [ -d /var/calculate/server-data/samba/unix/profiles ]; \ + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/profiles/unix ]; + then + if mkdir -p /var/calculate/server-data/samba/profiles && \ + mv -f /var/calculate/server-data/samba/unix/profiles \ + /var/calculate/server-data/samba/profiles/unix; + then + rmdir /var/calculate/server-data/samba/unix + ewarn + ewarn "Data from /var/calculate/server-data/samba/unix/profiles" + ewarn "was moved to /var/calculate/server-data/samba/profiles/unix" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/unix/profiles" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/unix/profiles" + eerror "to /var/calculate/server-data/samba/profiles/unix" + fi + fi + + if [ -d /var/calculate/server-data/samba/win/netlogon ]; + then + SAMBAUPDATE="" + if ! [ -d /var/calculate/server-data/samba/netlogon ]; + then + if mv -f /var/calculate/server-data/samba/win/netlogon \ + /var/calculate/server-data/samba/netlogon; + then + rmdir /var/calculate/server-data/samba/win + ewarn + ewarn "Data form /var/calculate/server-data/samba/win/netlogon" + ewarn "was moved to /var/calculate/server-data/samba/netlogon" + SAMBAUPDATE="TRUE" + fi + fi + if ! [ "${SAMBAUPDATE}" == "TRUE" ]; + then + eerror "Cannot move /var/calculate/server-data/samba/win/netlogon" + eerror "Please manualy move " + eerror "/var/calculate/server-data/samba/win/netlogon" + eerror "/var/calculate/server-data/samba/netlogon" + fi + fi + + if [ "${MAILUPDATE}" == "TRUE" ]; + then + ewarn + ewarn "Please update mail service by the command:" + ewarn "\tcl-update mail" + fi + if [ "${SAMBAUPDATE}" == "TRUE" ]; + then + ewarn + ewarn "Please update samba service by the command:" + ewarn "\tcl-update samba" + fi + + ewarn + ewarn "WARNING!!! If you have the samba service, then update it by the command:" + ewarn "\tcl-update samba" +} diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild index e3c47dd00..8977e89f7 100644 --- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild +++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild @@ -14,7 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64" -RDEPEND=">=sys-apps/calculate-utils-3.6 +RDEPEND=">=sys-apps/calculate-utils-3.7.1 app-arch/zstd app-arch/xz-utils" diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest index 97614ab88..02a723ea9 100644 --- a/sys-apps/calculate-utils/Manifest +++ b/sys-apps/calculate-utils/Manifest @@ -31,6 +31,8 @@ DIST calculate-lib-3.7.1.17.tar.bz2 1221433 BLAKE2B 31b98b117a6c49b92633faad7942 DIST calculate-lib-3.7.1.18.tar.bz2 1222053 BLAKE2B 8cef52493886e7c56e4619ec9d52b3b0ca2487874b3c7159fbb960b27cabf65aeab27d34ef29b1bbc16ce061a74f006532c1772165352adc804930141e10c8d6 SHA512 8aabdceb752bf75d751586894872559f2d02586414e9c678b2141640132119d1ed8bb88f72cf9a583c0f9139d450a14351a4bda618f7ca4321b8f0dcf1e73e2e DIST calculate-lib-3.7.1.19.tar.bz2 1222321 BLAKE2B 92459cf3d4ee7cb08fcb065bc1d81e2b4adeda27bf1d1eefa6f8521dbcfd0cbe75e45503283ce6f91e0a7d5a22b39ef4767696f9ead676e26da93b7e516f6260 SHA512 e0abc4805ac3b133bf77f55c35718ce6c52bd1eae3508dc655211bc9722eb0ce9194484f224db951370763311d526f1d852a7d8b1464b497672686630bbfaaee DIST calculate-lib-3.7.1.20.tar.bz2 1222141 BLAKE2B 104274b1a40cee2f6d31ec50a48a72e4cb7b9241d23db1ed73f506879231cfe02f4636ca05beae5cd9419eb81ccb545095275311cca778ea51274bffa455cda1 SHA512 42ff1f027444c77114f5d2488eaa0932de7f128c9e9fd117b6d9ff46530cad2a5329c89bc0d2884fce033baf27e9bca462965063830f4c2f6899ac3b4b484bb6 +DIST calculate-lib-3.7.1.21.tar.bz2 1222847 BLAKE2B 7069912aba94e46ea934470b5638fd4a340946b538fca739b7b6c4f85cfca0c907c598e2f7d0d3d6f25e1da58f335fb7ed4081918f72cf4967409f6b1bf9b837 SHA512 a573f396f6dd8a5324d7ae7a5e34f903c88c8c06584199696172aa391825dfe90ce75dbc21e2bfc037b8c9f653a0e0233f50a024d8ee9ff51e8547a8d6c9e662 DIST calculate-lib-3.7.1.9.tar.bz2 1222090 BLAKE2B 1fd7f425c9d4fc23c6d1fe530be6763963af39652ec990ccdd10646eaec91c81d31f4fd457bfaa6a26402662bb66c42519b433bcd912fc163c1e103af07a1ce6 SHA512 58cc34a03c98557b1dd7b34bf8e6ddc1f0b3e21a039a42c3e44c35e2e251ecf2604385c669e48267ef8e70b6cc34db9d2cfcbff9417f269bb9f9e03463ffac74 DIST calculate-update-3.7.1.1.tar.bz2 38770 BLAKE2B ad1d8c81a0d113437a47ce100926557fc6cf658fb9ef49a7136c03693efc153a3e4c811eaf642821a7a07697bbc2828acb7e67db719eb82780df31cc8d3d37eb SHA512 1918775b14c0feff5fa65ed924fb472c32067cd780fb2d931a34fc8ded114b4650ad76b58e8c6e307cabce5256a42ca71e42a3587a73f8c4f90a6bce5855dfb0 +DIST calculate-update-3.7.1.2.tar.bz2 39009 BLAKE2B 2911552cad3be64fa0524396c754edc060dae134693a1f32e44b7d3fcc4e0bcdf6c0e44709fd56ceca97890ecc657022d1ef1ba7de432774b55434372dd9c98b SHA512 39a7a7ce8cc3a78945b71d4315848d39765b7e6592aece82a2fe9c69d49f8b8727813d0760dec7878ff2f2ba8cc9b5b13b63b2d4375ea33340438b83c27bed21 DIST calculate-update-3.7.1.tar.bz2 38770 BLAKE2B 153f108b54ee247a37f1c7e7f3cda4f6f37523839df82f2f413aaaf8798becc285aa8cb04bbdad90e6b0fd9de9907e4afaad2f1e8a7aa954d666ab383de9b11f SHA512 a8e598a338a961320048391ab7b86757b93a3bc117bb713d4eb1ebfe316fe0669b78bc9418043d6ef554ee83da09765a95811b52a471d2bb254444c8a7bdf09a diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.1.33.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.1.33.ebuild new file mode 100644 index 000000000..606787815 --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.7.1.33.ebuild @@ -0,0 +1,28 @@ +# 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.1.21" + ["install"]="3.7.1.8" + ["core"]="3.7.1.5" + ["i18n"]="3.7.1.1" + ["client"]="3.7.1.1" + ["console"]="3.7.1.2" + ["console-gui"]="3.7.1.2" + ["update"]="3.7.1.2" + ["builder"]="3.7.1.6" +) + +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" +KEYWORDS="amd64" +