diff --git a/profiles/calculate/desktop/CLD/developer/package.keywords/default b/profiles/calculate/desktop/CLD/developer/package.keywords/default index fa75480dc..3e5deb3e8 100644 --- a/profiles/calculate/desktop/CLD/developer/package.keywords/default +++ b/profiles/calculate/desktop/CLD/developer/package.keywords/default @@ -5,7 +5,7 @@ ~media-gfx/cls-themes-10.9 amd64 x86 ~media-gfx/cld-themes-10.9 amd64 x86 -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 ~sys-apps/calculate-install-2.2.0.0_p20100812 amd64 x86 ~sys-apps/calculate-client-2.2.0.0_p20100813 amd64 x86 ~sys-apps/calculate-desktop-2.2.0.0_p20100813 amd64 x86 diff --git a/profiles/calculate/desktop/CLDG/developer/package.keywords b/profiles/calculate/desktop/CLDG/developer/package.keywords index 8f5824b44..21079a5b5 100644 --- a/profiles/calculate/desktop/CLDG/developer/package.keywords +++ b/profiles/calculate/desktop/CLDG/developer/package.keywords @@ -5,7 +5,7 @@ ~media-gfx/cls-themes-10.9 amd64 x86 ~media-gfx/cldg-themes-10.9 amd64 x86 -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 ~sys-apps/calculate-install-2.2.0.0_p20100812 amd64 x86 ~sys-apps/calculate-client-2.2.0.0_p20100813 amd64 x86 ~sys-apps/calculate-desktop-2.2.0.0_p20100813 amd64 x86 diff --git a/profiles/calculate/desktop/CLDX/developer/package.keywords b/profiles/calculate/desktop/CLDX/developer/package.keywords index d7d8921f2..49b0e6fdc 100644 --- a/profiles/calculate/desktop/CLDX/developer/package.keywords +++ b/profiles/calculate/desktop/CLDX/developer/package.keywords @@ -5,7 +5,7 @@ ~media-gfx/cls-themes-10.9 amd64 x86 ~media-gfx/cldx-themes-10.9 amd64 x86 -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 ~sys-apps/calculate-install-2.2.0.0_p20100812 amd64 x86 ~sys-apps/calculate-client-2.2.0.0_p20100813 amd64 x86 ~sys-apps/calculate-desktop-2.2.0.0_p20100813 amd64 x86 diff --git a/profiles/calculate/desktop/CLS/developer/package.keywords b/profiles/calculate/desktop/CLS/developer/package.keywords index 17505a8bf..ad22728f4 100644 --- a/profiles/calculate/desktop/CLS/developer/package.keywords +++ b/profiles/calculate/desktop/CLS/developer/package.keywords @@ -2,7 +2,7 @@ ~media-gfx/cls-themes-10.9 amd64 x86 -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 ~sys-apps/calculate-install-2.2.0.0_p20100812 amd64 x86 ~sys-apps/calculate-desktop-2.2.0.0_p20100813 amd64 x86 ~sys-apps/calculate-lib-2.2.0.0_p20100813 amd64 x86 diff --git a/profiles/calculate/server/CDS/developer/package.keywords b/profiles/calculate/server/CDS/developer/package.keywords index b9bfcb423..37f26a4ed 100644 --- a/profiles/calculate/server/CDS/developer/package.keywords +++ b/profiles/calculate/server/CDS/developer/package.keywords @@ -1,4 +1,4 @@ -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 =sys-apps/calculate-server-9999 amd64 x86 =sys-apps/calculate-lib-9999 amd64 x86 diff --git a/profiles/calculate/server/CSS/developer/package.keywords b/profiles/calculate/server/CSS/developer/package.keywords index 5575f701a..c682d9301 100644 --- a/profiles/calculate/server/CSS/developer/package.keywords +++ b/profiles/calculate/server/CSS/developer/package.keywords @@ -1,6 +1,6 @@ ~app-misc/css-meta-10.8.81 amd64 x86 -=sys-apps/calculate-9999 amd64 x86 +~sys-apps/calculate-1.4.0_p20100825 amd64 x86 ~sys-apps/calculate-install-2.2.0.0_p20100812 amd64 x86 ~sys-apps/calculate-lib-2.2.0.0_p20100813 amd64 x86 ~sys-apps/calculate-templates-2.2.0.0_p20100812 amd64 x86 diff --git a/sys-apps/calculate/ChangeLog b/sys-apps/calculate/ChangeLog index 6255fb7cc..0bfd147c4 100644 --- a/sys-apps/calculate/ChangeLog +++ b/sys-apps/calculate/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*calculate-1.4.0_p20100824 (25 Aug 2010) + + 25 Aug 2010; Mike Hiretsky (mhiretskiy) + +calculate-1.4.0_p20100825.ebuild: + Daily ebuild of calculate-1.4.0. + 10 Jun 2010; Mike Hiretsky (mhiretskiy) calculate-1.3.12.ebuild, calculate-9999.ebuild: Change depends. diff --git a/sys-apps/calculate/Manifest b/sys-apps/calculate/Manifest index cdddd7b55..0dfe1de04 100644 --- a/sys-apps/calculate/Manifest +++ b/sys-apps/calculate/Manifest @@ -1,5 +1,6 @@ DIST calculate-1.3.12.tar.bz2 170338 RMD160 d2b4ebee602ac05d9752bd52335c3318db440638 SHA1 1d361bcb53efc73684dffcca972987354ae237f8 SHA256 34d073fcb977bfdc8e8e38354a5171a9db9dcb65ec00ade10bba7ae302968d8f EBUILD calculate-1.3.12.ebuild 1712 RMD160 f066b6db680402c8e148d78bed0157b523a006d0 SHA1 583da9f51beb3e96109e1cbc4a53932eea4b6417 SHA256 9fb996e422c9439a1c880bbc8373a39b317381d1dc21336e164ad07db48ff1e1 +EBUILD calculate-1.4.0_p20100824.ebuild 1646 RMD160 9c95f5a58e63c20c739f65e483339415e76f5e3f SHA1 58daf819f2da68bf3c2c460c34d21a2bde910969 SHA256 debc317d50fedbd0105176f2667e1824bbc8e2528f56c113d3f71178335f8c30 EBUILD calculate-9999.ebuild 1606 RMD160 2dfb7382650af0470f4db0bcbf5b73a4b0b90e97 SHA1 d00467849ddc18f7cb67082dc9ac2b55489e2067 SHA256 a1546b9a24820ede098ad0dbd5230f7a2bce3f3c95a6135cc6af7f086eee2f9e -MISC ChangeLog 1888 RMD160 5ddf7e39ac0b9a98aab75ab79f201d612435ff98 SHA1 39d9bdbc1b858c735362e35ec6aa9f1ad3c081c6 SHA256 80e00d7ef448a549e979652e203396d5b56308af65e070063863e9ea3113e574 +MISC ChangeLog 2063 RMD160 1fbd35872e33a1b6a9250006e62106f607308e64 SHA1 2db24011f5c8d2b361f3ca4bd3a719b32df0eebb SHA256 81f1117ce8ce2f92935b54653e38b59b7fdcc346a18b64625997781555bd5e38 MISC metadata.xml 301 RMD160 2b89953e755d47fdc10f6def8e9d30975ed5aba1 SHA1 fa349945c077ca3d0fd95693f04a60f2da15f467 SHA256 074eff7c846f7fc8f0e74e0d992bdda9432164f28c0f3cf8991a1e59aac38700 diff --git a/sys-apps/calculate/calculate-1.4.0_p20100824.ebuild b/sys-apps/calculate/calculate-1.4.0_p20100824.ebuild new file mode 100644 index 000000000..681d8c9d5 --- /dev/null +++ b/sys-apps/calculate/calculate-1.4.0_p20100824.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit git + +EGIT_COMMIT="7c30b1720a72b9faab171580434142cf527a39d7" +EGIT_REPO_URI="git://git.calculate.ru/calculate.git" +DESCRIPTION="Program for installation, building and upgrading system" +HOMEPAGE="http://www.calculate-linux.org/main/ru/calculate" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="" +DEPEND="app-arch/p7zip + app-cdr/cdrkit + app-portage/layman + sys-apps/bar + sys-apps/hal + sys-fs/dosfstools + sys-fs/squashfs-tools" +RDEPEND="${DEPEND}" + +need_repair_manconf=0 + +pkg_setup() { + [ -e /var/db/pkg/sys-apps/calculate-1.2.7* ] && need_repair_manconf=1 + if [ -e /usr/calculate/install ] && \ + [ `ls /usr/calculate/install | grep -c ""` -gt 0 ] && \ + ! [ -e /var/db/pkg/sys-apps/calculate-[0-9]* ]; + then + eerror "Finding other copy of calculate in target directory" + eerror "Please, remove it, before continue installation." + eerror "\trm -rf /usr/calculate/install" + die "Cannot continue install. Remove previous calculate installation." + fi +} + +src_install() { + emake install DESTDIR="${D}" || die "Calculate installation failed." + dodoc Change.log +} + +pkg_postinst() { + if ! [ -e /usr/calculate/share/addition ]; + then + mkdir -p /usr/calculate/share/addition + fi + if ! [ -e /usr/calculate/share/linux ]; + then + mkdir -p /usr/calculate/share/linux + fi + if ! [ -e /usr/calculate/share/distfiles ]; + then + mkdir -p -m 2775 /usr/calculate/share/distfiles + chgrp portage /usr/calculate/share/distfiles + fi + [[ $need_repair_manconf -eq 1 ]] && \ + sed -ri 's#/usr/bin/python.*manrc \| ##' /etc/man.conf +}