Move unmerge action to postrm

atratsevskiy
parent e0cfdc6e3c
commit 92f7a346cd

@ -288,7 +288,7 @@ then
fi
fi
if [[ $EBUILD_PHASE == "prerm" ]]
if [[ $EBUILD_PHASE == "postrm" ]]
then
if [[ $EAPI -ge 4 ]] && [[ -z $REPLACED_BY_VERSION ]] ||
[[ $EAPI -lt 4 ]] && [[ ! -f /var/lib/calculate/-merge-$PN-$SLOT-$PPID ]]

@ -11,7 +11,7 @@ device=$2
id=$3
value=$4
BACKLIGHT_DIR=/sys/devices/virtual/backlight/acpi_video0
BACKLIGHT_DIR=/sys/class/backlight/acpi_video0
# increase backlight
inc_backlight() {

@ -2,11 +2,13 @@ AUX calculate-install-3.1.0_rootsize.patch 706 SHA256 ca1e8220dafcc5942406644a6b
AUX calculate-install-3.1.1_beta2-r1.patch 391 SHA256 d28624cc7df165ed8b40b2067672821857ecaf5bf274820c06766418de819f4e SHA512 e274e63e48f6940c9be001724b7de02e88538484f48d3147af71921f81ea514e49835ac9e0019a6eede3f409b41c7ad5f8c9aab23ee68daff2d6345455b6f763 WHIRLPOOL 241fda454f996f59057ae2a64a4422c2dd012924129090e18fed9321fae56f3a690612e558fcbcae65901a8952cb2b66e8834de8e230b391405394023513e77a
AUX calculate-install-3.1.1_beta2-r2.patch 392 SHA256 2c0691fe4368186bc9f86687f18d2bcac2d3a2b0061bce618f869cb9c950b720 SHA512 51bd8122e6d7673627eb59df6d6d75ac448efb87ad8e9bcb0c516b8954b997381bc84728eb5ce57a8d8538878d6fb6ff9ec812dedcd07ad34046d65f0c8661fb WHIRLPOOL 032705211de42169508e2867ee142c410e3a7b6c0aa048305b6f0a54e11cd2d62510e794f6cc1807c74cbec9d7ee7e3d114c1416a6e31c27106460a78f21494a
AUX calculate-install-3.1.1_beta2-r3.patch 352 SHA256 0f59fa35af0894d86efe82e61a8e6697612626b6c7ca5873424e89bf9941f3d4 SHA512 d47d394b8511cbfcc0f0483b11e118621f655fd3614a2edccf317f25b2f9cbe933d8ef6d795a5a4f7a512bf84d4bd5366f97a5631eec285fbe27eac9b4bfa39d WHIRLPOOL 63d4fd7009214d43bd34e0d6a64e6c5b0d3032ba5094e1ec190a2a38b10c7e097c5af1b18b6ed1da751202575c6919b6f748eae9520b4e2ec145d8c75c4e1210
AUX calculate-install-3.1.1_beta2-r4.patch 912 SHA256 0f69b4ca57be49753b727bcfef1259753083490c20b77926ffe6226763bdb019 SHA512 5931f363f4313eb58d75dd8281031e4b4bbfe696cfced54ce435f5ec569ae8e224b52c5e0bd6f105bbb94b6a83ec63a30afb54fab349f08b5e3f7b0f748e58ea WHIRLPOOL 5e0a5ba1b28fef78e58adb61479995d662d8efd897620dd892f974cac71818bc378e6269a1a679525f35937a3842050bdbeea574e112c64163350ec4e0404821
DIST calculate-install-3.1.1_beta2.tar.bz2 74168 SHA256 5338d5949959788289451543883a8d5a34df9311446c6b786275c8d55448e2f0 SHA512 bd99830585855584d5633e8d4d090766e694dce636af74e217ca59383d084452e3eb9207561965a39fdd102e0c6f163759e405c26e251a9355f2438be370635c WHIRLPOOL 5c6170e5edbf6168e78f8eea8e62131b7df4e9cb9eea8ea0a0c9361fb03c3c410d4f5ec9c0152d3f57a500bcae9580c40d4528ad61bd3dadd5133e950dfd57c2
EBUILD calculate-install-2.2.9999.ebuild 685 SHA256 5b6fe8d4f7c8109f9adcdfa6546bb253c9f04e1d10dc6b1aa6b1087c2486d096 SHA512 0b74f8bb94ba419869cc209963bc8f79cd98e4ffdd95b400f3e6c80d32da23ed314c3ec6bca6163f32e64c6dbdb1503a23e68d49c8f011c762a77b03bc94a326 WHIRLPOOL 5c9e1acddd461064c67e152429e98651298c54c8e4a7f5c9c419cda4045b6a1b5221a5bbfc3c95dd03b48f157d40e1a37e8f7e42e9aacff4575851150cbdb9a4
EBUILD calculate-install-3.1.1_beta2-r1.ebuild 1055 SHA256 b9f6cd20036b5655c37218356c8ee2b4373b0362b48d552a8f24328103441584 SHA512 848c4b8aaf65df7837f3c77c3a5749a167869e502d58394b9c1ffdeccbd2e988896dc20a4986d23be6eba8d46ef55568c07a08aa47b2fc35ff0e69f408480f7a WHIRLPOOL d484fbe2db046f9c72e3786efbd0ec6e36a555c898d43d889c5026749a493cccbf7bd544b6322c4732129126aa061608dbbbfadae77d4224bd5741154e0d36e2
EBUILD calculate-install-3.1.1_beta2-r2.ebuild 1055 SHA256 d8df34d43d8a4f137c0e35425203f4d7c2add8d4eac78913d52c00370ae557a1 SHA512 7e991ecd6800f7fe1e868837c0e6ac22a6bc208b50ca34e085eb4a4d75cb53f531f0148f1b2b2dfdbc95f956e3e728ee73a2f37b65706dcf5baad65fb32f3063 WHIRLPOOL 3e025764535221dd513abf963ae3a44cd77abfd41644d66359d699051a3accf0d55aeafb6362bdc53b723b52fd7844b1fff1b8d06b1c96376cabdb4dcdd9e2e5
EBUILD calculate-install-3.1.1_beta2-r3.ebuild 1055 SHA256 101a7d743bdb66feb175215521ac590ac52790b18232b37f9f59023b6e311a9c SHA512 506e48a029bec01dba62f70f6129a022de6c1e110a5d43712da17708cd30abf9ecac327b8d307a7928f141cc991014b27fb62cc17f2f241911d92efc5c6219e1 WHIRLPOOL 83ad96ca8dc5f655a0773872ed5f6aff407e329973c2bc81a9e35df6338422e08ea859df805661d205f747021e205ed0d215d9a5b8ee0cf0354f0a2601d940b1
EBUILD calculate-install-3.1.1_beta2-r4.ebuild 1055 SHA256 ab3c972950793ed3e2d3290d4d2041832ca75d25f20934d9fbc04edbb7dc56dc SHA512 08170ee058e7da05fe7de8b444e421aac86c8532840520950773ab4a36aca1934fbb581224fbe6dcce3a7827290a74e70eda885f656298663055195ecdea3ff1 WHIRLPOOL 017050f9eaafaed09614ed860e90d32f6a1d2797f140dccde7a01761878b0c9c8fd333a30b20a99f0aaf07aa76676a9ea9aca66a0aa8a994ce8b0a5c89f781cf
EBUILD calculate-install-3.1.1_beta2.ebuild 912 SHA256 e0a7f90c65b8f3fe43607e198ee19ec51b015cb5ef4c7854daba2a4cb9002d52 SHA512 046d6f31d69f39517f9d32bf9f7b4b499f7d0219a59bfdaaaef9bde6a619ab61ee4d1f6d8e1aba8841d5574fbbd16d74effb6e2e16d6ba346e3e79bacd1efa17 WHIRLPOOL 67bfdfae7831c060d8faed52be315c2ce6847a26a05786be46d420f39fa46116e26d6ad2cfd20177dfcec11f7429fc7682d01825e348b35bcbc30829ee0b95a2
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3

@ -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="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.1_beta2
!<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_beta2-r4.patch"
}

@ -0,0 +1,28 @@
diff --git data/calculate data/calculate
index 1ec60b3..dc36f4c 100644
--- data/calculate
+++ data/calculate
@@ -142,6 +142,10 @@ start() {
touch /* /bin/* /sbin/*
udevadm trigger --action="add" --subsystem-match=net
fi
+ if [[ $roottype != "livecd" ]]
+ then
+ /usr/bin/eix-checkout &>/dev/null &
+ fi
/sbin/rc-update --update
return 0
diff --git install/variables/action.py install/variables/action.py
index d704e74..16f57da 100644
--- install/variables/action.py
+++ install/variables/action.py
@@ -97,6 +97,7 @@ class VariableAcInstallUnmerge(ActionVariable):
Action variable which has value "up" on prerm ebuild phase
"""
def action(self,cl_action):
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
+ if cl_action == "merge" and \
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
return "on"
return "off"

@ -6,6 +6,7 @@ EBUILD calculate-utilities-3.1.1_beta2-r1.ebuild 809 SHA256 596a28fb46d2e427580a
EBUILD calculate-utilities-3.1.1_beta2-r2.ebuild 809 SHA256 e8d66953f8ac7e8a2a2c9bff472494aca0f5e112c5c28161514abae30b84b0e5 SHA512 07116d71e005af81a7b0e71087eea4d4c26a69d3efeb578a6bbd29732cc5800a0e4a516d94bbe79e6d2142aa55e91016cfa7e5f1a72f68e0dc60b2af135be536 WHIRLPOOL 3e363afbb174aec748a0eeb55ae2f0f832b7a234252bbfd1a41e59a6128eec558b3722a1303c709f9f5e4801c9c76622d5ac3f9f701fc204fc89647d1cdeb416
EBUILD calculate-utilities-3.1.1_beta2-r3.ebuild 809 SHA256 9ebc3db23e20caf90b332ecb0e8a24dd240f87ddbbe42e79faceeeb57ab9556a SHA512 3a6bec383357549dc1cb856c2bc2ff451479bbccbff25cee403bc93bc7b7fee951fb72ea1dd10b37cb6ddf615d24da975f7bcaee5ebac47e5a210f1d2b825d0a WHIRLPOOL 00a73458e658c587eb5277dae6b99c4f24a1d954463923eb8e50c13384722859dfb5b332a3b778c1c0271e30972f753be910eb5da0d11a179d0f2a19b0811b06
EBUILD calculate-utilities-3.1.1_beta2-r4.ebuild 809 SHA256 decd7fc60c5f136714bc0a5b7df850d126a1082aade5d49150ed66a02afa4286 SHA512 b93ec92a962c5592ca7d1866a9647ace1e3a0c5792a21eca15a103c98f2c6491b6c862550060ead3b65177acbc21f5da8191d9ddc8734699c92ab14fe41b593c WHIRLPOOL ec76ea2ff3cc136762c37abcbc6758a79d1057dd65cf9bbe40d900e1881d1cad97c97d4ed21bcdcabea3bf516111d8caa8ba8adac7db318ce60810a8d63f4d39
EBUILD calculate-utilities-3.1.1_beta2-r5.ebuild 809 SHA256 092e1661eec01f0b1a1b6b378abcda549135938e6932f7fac1b7f99547624944 SHA512 459225c04fef0d3c001c5173bd3d311d96040e8202cf3d199ae5c49452146e065e111d94040030dd916c6c6b6b94c54a407e9a853cb1007e0671b13405e2217d WHIRLPOOL e0144ff5aa75fd253b22923723248bd3289cb14b40564b7b505dd6c9dead174762e00f5ab18b02f2fcc786063b8d3719050431912e03a11387c44343975b0ad6
EBUILD calculate-utilities-3.1.1_beta2.ebuild 803 SHA256 028d41834b7a1c1349364a4cb0b886d788a6c356ac5889c927dc5ecb2d1ae88f SHA512 61489c60830416e5c2940b1b5fbb2e2eec506f04a37c7edcbdeff3fda3429d6af055f08f514ed3edc85e586ac85e357f69de4b9fa17cc42d32ebfb0643612cd7 WHIRLPOOL 52179959c111792ede53a7ad801c9343fa09f2908b8747c37229623f1a9ef2b22ce147b75e7a932eaab8649d7e46c91fe45f0f43c446b1dfa5a9e41abd457741
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -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="amd64 x86"
IUSE="cl_consolegui cl_client cl_desktop cl_console"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-3.1.1_beta2-r4
=sys-apps/calculate-i18n-3.1.1_beta2
=sys-apps/calculate-lib-3.1.1_beta2
=sys-apps/calculate-core-3.1.1_beta2-r2
=sys-apps/calculate-update-3.1.1_beta2
cl_client? ( =sys-apps/calculate-client-3.1.1_beta2 )
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta2 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta2 )
cl_console? ( =sys-apps/calculate-console-3.1.1_beta2 )
"
Loading…
Cancel
Save