From d1a081490925cc1876a78f59e951ee61cfede151 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Thu, 22 Jan 2015 17:50:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20eclass=20calculate-utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eclass/calculate-utils.eclass                 | 19 +------------------
 .../calculate-utils-3.3.9999.ebuild           | 10 ++++++++++
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/eclass/calculate-utils.eclass b/eclass/calculate-utils.eclass
index 0230a60b7..5f6f7c5ab 100644
--- a/eclass/calculate-utils.eclass
+++ b/eclass/calculate-utils.eclass
@@ -19,7 +19,7 @@ then
 	inherit git-2
 fi
 
-EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_preinst"
+EXPORTED_FUNCTIONS="src_compile src_install pkg_postinst pkg_preinst"
 
 CALCULATE_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3"
 MIRROR_URI="http://mirror.yandex.ru/calculate/calculate3"
@@ -208,23 +208,6 @@ DEPEND="sys-devel/gettext"
 
 REQUIRED_USE="client? ( desktop )"
 
-# @FUNCTION: calculate-utils_src_unpack
-# @DESCRIPTION:
-# Unpack all modules of calculate utils
-calculate-utils_src_unpack() {
-	if [[ ${PV/9999/} != ${PV} ]]
-	then
-		for MODULE in "${MODULE_INFO[@]}"
-		do
-			MODULE_DATA=( $MODULE )
-			MODULE_PN=${MODULE_DATA[0]}
-			EGIT_SOURCEDIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate.ru/calculate-3/${MODULE_PN}.git git-2_src_unpack
-		done
-	else
-		distutils-r1_src_unpack
-	fi
-}
-
 # @FUNCTION: calculate-utils_src_compile
 # @DESCRIPTION:
 # Compile all modules of calculate utils
diff --git a/sys-apps/calculate-utils/calculate-utils-3.3.9999.ebuild b/sys-apps/calculate-utils/calculate-utils-3.3.9999.ebuild
index ce420f0bc..4d3834f4a 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.3.9999.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.3.9999.ebuild
@@ -13,3 +13,13 @@ HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS=""
+
+src_unpack() {
+	for MODULE in "${MODULE_INFO[@]}"
+	do
+		MODULE_DATA=( $MODULE )
+		MODULE_PN=${MODULE_DATA[0]}
+		EGIT_SOURCEDIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate.ru/calculate-3/${MODULE_PN}.git git-2_src_unpack
+	done
+}
+