Fix update the Calculate Utilities.

app-misc/calculate-meta/ChangeLog

@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-meta-11.6-r1 (05 Jul 2011)
+
+  05 Jul 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>
+  +calculate-meta-11.6-r1.ebuild:
+  Fix updating the calculate utilities.
+
 *calculate-meta-11.6 (18 May 2011)
 
   18 May 2011; Alexander Tratsevskiy (L'autre) <at@calculate.ru>

app-misc/calculate-meta/Manifest

@@ -1,2 +1,3 @@
+EBUILD calculate-meta-11.6-r1.ebuild 1318 RMD160 166ba85f0d1d00b09b231065cae0e32fcb2990ef SHA1 90f01f13936d07c3a60f10fa35f668e69ecbf74d SHA256 7e6df23469303f119442c50eb8678c7cc37c00d7adbd6f1b8a0e5bb9ed6018fc
 EBUILD calculate-meta-11.6.ebuild 711 RMD160 a9ee5d3e306afb0c5c3176fffab32b9f79a6c153 SHA1 3f1e232d2eeb098deee1a84e9007a4c26dc1041b SHA256 6a48ab2e12fb21a6b89cb3d336bdd764906713b97efa1a26fa3705da7b5d3378
-MISC ChangeLog 1074 RMD160 a20aed786ea716a6479e3e7154d515e79f92a076 SHA1 64c5eeb2f66b8ab7468828a989f92c89958f9c08 SHA256 1ea2e88af98c6c8986c2a7fa700858083214e3d7ab666933b7e467d50f6b0b13
+MISC ChangeLog 1253 RMD160 df7e5a9ce57941d3af7367e6124a059964c9a880 SHA1 21c84d5034727f93a51bd670a6fb99fd8b3ae588 SHA256 baf5b66934b312d9403f6f25b527f234a3306022856adf04af8713b9369d84fe

app-misc/calculate-meta/calculate-meta-11.6-r1.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit calculate
+EAPI=2
+
+DESCRIPTION="Calculate Linux (meta package)"
+HOMEPAGE="http://www.calculate-linux.org"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="
+cdistro_CLD
+cdistro_CLDG
+cdistro_CLDX
+cdistro_CMC
+cdistro_CLS
+cdistro_CDS
+cdistro_CSS
+"
+
+RDEPEND="${RDEPEND}
+	!sys-apps/calculate
+"
+
+RDEPEND="${RDEPEND}
+	cdistro_CLD? ( app-misc/cld-meta )
+	cdistro_CLDG? ( app-misc/cldg-meta )
+	cdistro_CLDX? ( app-misc/cldx-meta )
+	cdistro_CMC? ( app-misc/cmc-meta )
+	cdistro_CLS? ( app-misc/cls-meta )
+	cdistro_CDS? ( app-misc/cds-meta )
+	cdistro_CSS? ( app-misc/css-meta )
+"
+
+pkg_postinst() {
+	if [[
+		-z `grep cl_merges /etc/calculate/calculate2.env` &&
+		! -z `grep cl_merges /etc/config-archive/etc/calculate/calculate2.env`
+	]];
+	then
+		mv /etc/config-archive/etc/calculate/calculate2.env \
+		/etc/calculate/calculate2.env
+		rm /etc/config-archive/etc/calculate/calculate2.env.dist
+		ewarn "Restored file /etc/calculate/calculate2.env."
+	fi
+
+	if [[ -e /etc/calculate/._cfg0000_calculate2.env ]];
+	then
+		rm /etc/calculate/._cfg0000_calculate2.env
+	fi
+
+	if [[ ! -e /etc/env.d/02locale ]];
+	then
+		eerror "Please restore the system settings by running 'cl-install --live'!"
+	fi
+}
+