diff --git a/eclass/calculate-utils-r8.eclass b/eclass/calculate-utils-r11.eclass
similarity index 86%
rename from eclass/calculate-utils-r8.eclass
rename to eclass/calculate-utils-r11.eclass
index 2df0e6375..e1cf1cfef 100644
--- a/eclass/calculate-utils-r8.eclass
+++ b/eclass/calculate-utils-r11.eclass
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-# @ECLASS: calculate-utils-r8.eclass
+# @ECLASS: calculate-utils-r11.eclass
 # @MAINTAINER:
 # support@calculate.ru
 # @AUTHOR:
@@ -151,34 +151,31 @@ RDEPEND="
 		sys-fs/mdadm
 	)
 	!minimal? (
-		dev-python/passlib[python_targets_python2_7]
 		>=sys-apps/util-linux-2.19.1
 		net-misc/rsync
 		dev-python/sudsds[python_targets_python2_7]
 		net-libs/dslib[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.14[python_targets_python2_7]
+		>=dev-python/pyopenssl-python2-0.14
 		dev-libs/openssl
-		dev-python/m2crypto[python_targets_python2_7]
-		dev-python/pytz[python_targets_python2_7]
+		dev-python/m2crypto-python2
+		dev-python/pytz-python2
 	)
 	gpg? (
 		app-crypt/gnupg
 		app-crypt/openpgp-keys-calculate-release
 	)
-	>=dev-python/pyxml-0.8[python_targets_python2_7]
+	>=dev-python/pyxml-0.8
 	sys-apps/iproute2[-minimal]
 	sys-apps/pciutils
 	app-arch/xz-utils
-	dev-python/pyinotify[python_targets_python2_7]
-	sys-apps/file[python,python_targets_python2_7]
 
 	app-eselect/eselect-repository
 	|| (
 		sys-apps/portage[python_targets_python3_6]
 		sys-apps/portage[python_targets_python3_7]
 		sys-apps/portage[python_targets_python3_8]
+		sys-apps/portage[python_targets_python3_9]
 	)
-	dev-python/pyxattr[python_targets_python2_7]
 	>=virtual/udev-197
 	!app-misc/livecd-tools
 	sys-apps/coreutils[xattr]
@@ -189,7 +186,7 @@ RDEPEND="
 		net-fs/nfs-utils
 	)
 
-	>=dev-python/soaplib-1.0
+	>=dev-python/soaplib-1.0-r3
 	!<sys-apps/calculate-server-2.1.18-r1
 
 	desktop? (
@@ -199,37 +196,45 @@ RDEPEND="
 		sys-auth/pam_keystore
 		dev-lang/swig
 		dev-qt/qdbus:5
-		dev-python/pygobject[python_targets_python2_7]
+		sys-apps/edid-decode
+		|| (
+			( dev-python/pygobject[python_targets_python3_7]
+			dev-python/dbus-python[python_targets_python3_7]
+			)
+			( dev-python/pygobject[python_targets_python3_6]
+			dev-python/dbus-python[python_targets_python3_6]
+			)
+			( dev-python/pygobject[python_targets_python3_8]
+			dev-python/dbus-python[python_targets_python3_8]
+			)
+		)
 	)
 
 	server? (
 		sys-auth/pam_ldap
 		sys-auth/nss_ldap
-		dev-python/python-ldap
+		dev-python/python2-ldap
 	)
 
 	client? (
 		dev-python/py-smbpasswd
-		>=dev-python/python-ldap-2.0[ssl,python_targets_python2_7]
+		>=dev-python/python2-ldap-2.0[ssl]
 		sys-auth/pam_client
 		>=sys-auth/pam_ldap-180[ssl]
 		>=sys-auth/nss_ldap-239
 	)
 
 	qt5? (
-		dev-python/dbus-python[python_targets_python2_7]
-		|| (
-			dev-python/pillow[python_targets_python2_7]
-			dev-python/imaging[python_targets_python2_7]
-		)
-		dev-python/PyQt5[python_targets_python2_7]
+		dev-python/dbus-python2
+		media-gfx/imagemagick[jpeg]
+		dev-python/PyQt5-python2
 	)
 
 	dbus? (
-		dev-python/dbus-python
+		dev-python/dbus-python2
 	)
 
-	dev-python/pexpect[python_targets_python2_7]
+	dev-python/pexpect-python2
 
 	!<sys-apps/calculate-lib-2.1.12
 	!sys-apps/calculate-lib:3
@@ -249,10 +254,10 @@ DEPEND="sys-devel/gettext"
 
 REQUIRED_USE="client? ( desktop )"
 
-# @FUNCTION: calculate-utils-r8_src_compile
+# @FUNCTION: calculate-utils-r11_src_compile
 # @DESCRIPTION:
 # Compile all modules of calculate utils
-calculate-utils-r8_src_compile() {
+calculate-utils-r11_src_compile() {
 	if ! use backup
 	then
 		sed -ir "s/'cl-backup'/None/" calculate-core-*/pym/core/wsdl_core.py
@@ -276,10 +281,10 @@ calculate-utils-r8_src_compile() {
 	done
 }
 
-# @FUNCTION: calculate-utils-r8_src_install
+# @FUNCTION: calculate-utils-r11_src_install
 # @DESCRIPTION:
 # Install all modules of calculate utils
-calculate-utils-r8_src_install() {
+calculate-utils-r11_src_install() {
 	prepare_module_info
 	for MODULE in "${MODULE_INFO[@]}"
 	do
@@ -305,7 +310,7 @@ python_install() {
 	distutils-r1_python_install $PYTHON_INSTALL_PARAMS
 }
 
-calculate-utils-r8_pkg_preinst() {
+calculate-utils-r11_pkg_preinst() {
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-setup
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-patch
 	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update
diff --git a/eclass/calculate-utils-r9.eclass b/eclass/calculate-utils-r9.eclass
deleted file mode 100644
index 426c2dd13..000000000
--- a/eclass/calculate-utils-r9.eclass
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: calculate-utils-r9.eclass
-# @MAINTAINER:
-# support@calculate.ru
-# @AUTHOR:
-# Author: Mir Calculate
-# @BLURB: Functions for calculate-utils
-# @DESCRIPTION:
-# This eclass use for calculate-utils ebuild
-
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1 eutils
-
-EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
-
-CALCULATE_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate3"
-MIRROR_URI="http://mirror.yandex.ru/calculate/source/calculate3"
-
-# @ECLASS-VARIABLE: CALCULATE_MODULES
-# @DESCRIPTION:
-# Associative array module names and versions
-# Example:
-# declare -A CALCULATE_MODULES=(
-#   ["console-gui"]="3.2.3.4"
-# )
-
-# @ECLASS-VARIABLE: CALCULATE_MODULES_USE
-# @DESCRIPTION:
-# Associative array module names and use for IUSE
-# Example:
-# declare -A CALCULATE_MODULES_USE=(
-#   ["console-gui"]=""
-# )
-
-# @ECLASS-VARIABLE: CALCULATE_TARBALL
-# @DESCRIPTION:
-# Associative array module names and tarball archive name
-# Example:
-# declare -A CALCULATE_TARBALL=( ["lib"]="calculate-lib-3.2.3-r1.tar.bz2" )
-
-# @ECLASS-VARIABLE: UTILS_PV
-# @DESCRIPTION:
-# Default version of all components
-# Example:
-: ${UTILS_PV:=$(ver_cut 1-3 ${PV})}
-
-declare -g -A CALCULATE_TARBALL_=()
-
-declare -g -A CALCULATE_MODULES_=(
-	["lib"]="$UTILS_PV"
-	["builder"]="$UTILS_PV"
-	["install"]="$UTILS_PV"
-	["core"]="$UTILS_PV"
-	["i18n"]="$UTILS_PV"
-	["update"]="$UTILS_PV"
-	["desktop"]="$UTILS_PV"
-	["client"]="$UTILS_PV"
-	["console-gui"]="$UTILS_PV"
-	["console"]="$UTILS_PV"
-	["server"]="$UTILS_PV"
-	["ldap"]="$UTILS_PV"
-	["unix"]="$UTILS_PV")
-
-declare -g -A CALCULATE_MODULES_USE_=(
-	["desktop"]="desktop"
-	["client"]="client"
-	["console-gui"]="qt5"
-	["console"]="console"
-	["server"]="server"
-	["ldap"]="server"
-	["unix"]="server"
-)
-
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-# @FUNCTION: prepare_variables
-# @DESCRIPTION:
-# Prepare variables for ebuild
-prepare_variables() {
-	for module in ${!CALCULATE_MODULES[@]}
-	do
-		CALCULATE_MODULES_[$module]=${CALCULATE_MODULES[$module]}
-	done
-
-	for module in ${!CALCULATE_MODULES_USE[@]}
-	do
-		CALCULATE_MODULES_USE_[$module]=${CALCULATE_MODULES_USE[$module]}
-	done
-
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_PN=calculate-${module}
-		MODULE_PV=${CALCULATE_MODULES_[$module]}
-		if [[ -n ${CALCULATE_TARBALL[$module]} ]]
-		then
-			CALCULATE_TARBALL_[$module]="${MODULE_PN}/${CALCULATE_TARBALL[$module]}"
-		else
-			CALCULATE_TARBALL_[$module]="${MODULE_PN}/${MODULE_PN}-${MODULE_PV}.tar.bz2"
-		fi
-	done
-
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
-		MODULE_URI=""
-		for URI in $CALCULATE_URI $MIRROR_URI
-		do
-			MODULE_URI="${MODULE_URI} ${URI}/${CALCULATE_TARBALL_[$module]}"
-		done
-		if [[ -n $MODULE_USE ]]
-		then
-			MODULE_URI="${MODULE_USE}? ( $MODULE_URI )"
-		fi
-		SRC_URI="$SRC_URI $MODULE_URI"
-	done
-
-	IUSE="+install dbus +gpg minimal pxe backup ${CALCULATE_MODULES_USE_[@]}"
-	S="${WORKDIR}"
-}
-
-# @FUNCTION: prepare_module_info
-# @DESCRIPTION:
-# Prepare module info for compile and install
-prepare_module_info() {
-	MODULE_INFO=()
-	for module in ${!CALCULATE_MODULES_[@]}
-	do
-		MODULE_USE=${CALCULATE_MODULES_USE_[$module]}
-		if [[ -z $MODULE_USE ]] || use $MODULE_USE
-		then
-				MODULE_INFO+=("calculate-$module ${CALCULATE_MODULES_[$module]}")
-		fi
-	done
-}
-
-prepare_variables
-
-RDEPEND="
-	install? ( >=app-cdr/cdrtools-3.01_alpha13
-		>=sys-boot/grub-2.00-r3
-		>=sys-boot/syslinux-5
-		sys-fs/squashfs-tools
-		sys-fs/dosfstools
-		sys-block/parted
-		sys-apps/gptfdisk
-		sys-fs/lvm2
-		sys-fs/mdadm
-	)
-	!minimal? (
-		dev-python/passlib[python_targets_python2_7]
-		>=sys-apps/util-linux-2.19.1
-		net-misc/rsync
-		dev-python/sudsds[python_targets_python2_7]
-		net-libs/dslib[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.14[python_targets_python2_7]
-		dev-libs/openssl
-		dev-python/m2crypto[python_targets_python2_7]
-		dev-python/pytz[python_targets_python2_7]
-	)
-	gpg? (
-		app-crypt/gnupg
-		app-crypt/openpgp-keys-calculate-release
-	)
-	>=dev-python/pyxml-0.8[python_targets_python2_7]
-	sys-apps/iproute2[-minimal]
-	sys-apps/pciutils
-	app-arch/xz-utils
-	dev-python/pyinotify[python_targets_python2_7]
-	sys-apps/file[python,python_targets_python2_7]
-
-	app-eselect/eselect-repository
-	|| (
-		sys-apps/portage[python_targets_python3_6]
-		sys-apps/portage[python_targets_python3_7]
-		sys-apps/portage[python_targets_python3_8]
-	)
-	dev-python/pyxattr[python_targets_python2_7]
-	>=virtual/udev-197
-	!app-misc/livecd-tools
-	sys-apps/coreutils[xattr]
-
-	pxe? ( sys-apps/calculate-server
-		net-ftp/tftp-hpa
-		net-misc/dhcp
-		net-fs/nfs-utils
-	)
-
-	>=dev-python/soaplib-1.0
-	!<sys-apps/calculate-server-2.1.18-r1
-
-	desktop? (
-		media-gfx/feh
-		x11-apps/xmessage
-		sys-apps/keyutils
-		sys-auth/pam_keystore
-		dev-lang/swig
-		dev-qt/qdbus:5
-		|| (
-			dev-python/pygobject[python_targets_python3_7]
-			dev-python/pygobject[python_targets_python3_6]
-			dev-python/pygobject[python_targets_python3_8]
-		)
-		|| (
-			dev-python/dbus-python[python_targets_python3_7]
-			dev-python/dbus-python[python_targets_python3_6]
-			dev-python/dbus-python[python_targets_python3_8]
-		)
-	)
-
-	server? (
-		sys-auth/pam_ldap
-		sys-auth/nss_ldap
-		dev-python/python-ldap
-	)
-
-	client? (
-		dev-python/py-smbpasswd
-		>=dev-python/python-ldap-2.0[ssl,python_targets_python2_7]
-		sys-auth/pam_client
-		>=sys-auth/pam_ldap-180[ssl]
-		>=sys-auth/nss_ldap-239
-	)
-
-	qt5? (
-		dev-python/dbus-python[python_targets_python2_7]
-		|| (
-			dev-python/pillow[python_targets_python2_7]
-			dev-python/imaging[python_targets_python2_7]
-		)
-		dev-python/PyQt5[python_targets_python2_7]
-	)
-
-	dbus? (
-		dev-python/dbus-python
-	)
-
-	dev-python/pexpect[python_targets_python2_7]
-
-	!<sys-apps/calculate-lib-2.1.12
-	!sys-apps/calculate-lib:3
-	!sys-apps/calculate-i18n:3
-	!sys-apps/calculate-client:3
-	!sys-apps/calculate-desktop:3
-	!sys-apps/calculate-console:3
-	!sys-apps/calculate-console-gui:3
-	!sys-apps/calculate-update:3
-	!sys-apps/calculate-install:3
-	!sys-apps/calculate-core:3
-	server? ( !sys-apps/calculate-server )
-	backup? ( !sys-apps/calculate-server )
-"
-
-DEPEND="sys-devel/gettext"
-
-REQUIRED_USE="client? ( desktop )"
-
-# @FUNCTION: calculate-utils-r9_src_compile
-# @DESCRIPTION:
-# Compile all modules of calculate utils
-calculate-utils-r9_src_compile() {
-	if ! use backup
-	then
-		sed -ir "s/'cl-backup'/None/" calculate-core-*/pym/core/wsdl_core.py
-		sed -ir "s/'cl-backup-restore'/None/" calculate-core-*/pym/core/wsdl_core.py
-		sed -ir "s/__('Backup')/None/g" calculate-core-*/pym/core/wsdl_core.py
-	fi
-	prepare_module_info
-	for MODULE in "${MODULE_INFO[@]}"
-	do
-		MODULE_DATA=( $MODULE )
-		MODULE_PN=${MODULE_DATA[0]}
-		MODULE_PV=${MODULE_DATA[1]}
-		S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
-		cd $S
-		if [[ $MODULE_PN == "calculate-lib" ]]
-		then
-			sed -ri "/class VariableClVer/{N;N;N;N;s/value = \".*?\"/value = \"${PV}\"/;}" \
-				pym/calculate/lib/variables/__init__.py
-		fi
-		distutils-r1_src_compile
-	done
-}
-
-# @FUNCTION: calculate-utils-r9_src_install
-# @DESCRIPTION:
-# Install all modules of calculate utils
-calculate-utils-r9_src_install() {
-	prepare_module_info
-	for MODULE in "${MODULE_INFO[@]}"
-	do
-		MODULE_DATA=( $MODULE )
-		MODULE_PN=${MODULE_DATA[0]}
-		MODULE_PV=${MODULE_DATA[1]}
-		S="${WORKDIR}/${MODULE_PN}-${MODULE_PV}"
-		cd $S
-		distutils-r1_src_install
-	done
-}
-
-python_install() {
-	PYTHON_INSTALL_PARAMS=
-	if [[ $MODULE_PN == "calculate-client" ]]
-	then
-		PYTHON_INSTALL_PARAMS="--install-scripts=/usr/sbin"
-	fi
-	if [[ $MODULE_PN == "calculate-core" ]] && use dbus
-	then
-		PYTHON_INSTALL_PARAMS="$PYTHON_INSTALL_PARAMS --dbus"
-	fi
-	distutils-r1_python_install $PYTHON_INSTALL_PARAMS
-}
-
-calculate-utils-r9_pkg_preinst() {
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-setup
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-core-patch
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update
-	dosym /usr/libexec/calculate/cl-core-wrapper /usr/bin/cl-update-profile
-	if use qt5
-	then
-		dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui-install
-		dosym /usr/lib/python-exec/python2.7/cl-console-gui /usr/bin/cl-console-gui-update
-	fi
-}
diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest
index dc7f19a77..3e41ff8a7 100644
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@@ -1,47 +1,15 @@
-DIST calculate-builder-3.6.7.12.tar.bz2 42323 BLAKE2B 6c77528aed69feda29af6b30f0893f3a61bc02e5e21626630f67bf09df51792c8afb27f3370863af0c923cd3eec2d126d74acc72a97f615a47f8d71fcd05da86 SHA512 786af71883d584e00fb89bc22d61dcd5468a7a21ee880db4e2113f7ba30acf7049d5c3f18f5f15e0cb87f188528d3b22d802004b940f85d2201040c1ce657ce0
-DIST calculate-builder-3.6.7.7.tar.bz2 42466 BLAKE2B 7be5e5424d820d78dd284e3e177e046166e3306877ae5a44ecd6a2022842cff23046e13c88da9f8ea4bc03ce5194e22ed702e34c8b97c3d3cfe34a77e1710c78 SHA512 f60c90c1744c5d1f89ec1a3d06836b7f3e9145ae813f260eccf3e7e9cb312c365c01bc2bd792e92af11b7530d37be938d6a6b9d91aaa08d212abac89356af567
 DIST calculate-builder-3.6.8.tar.bz2 42331 BLAKE2B 9d701b522d969f4f34ea6be5590b22875d76c27596c2d42dcc1f2ba2dd72a79c48ab3d758879562526783c9c7155fcf0f0cfed03448c4be122f6ec7645d5cfd6 SHA512 668c8bd99cdad2467115516a5fdf8be49e6b77c88f8bce363bd95e82666fb11f12fa09e4fe10252094c3670de097f07f4f2da31aebacc69f149de7d15eb3a081
-DIST calculate-client-3.6.7.tar.bz2 31605 BLAKE2B 08686043d8607fdb1fff2edd5c45028f5e6ab6eb2720d48aab668582d33b2ad6385e570987c86aaacfd027e1f459eb9cc1a482f58df4c87a7e70d3d9707a7cc8 SHA512 97e1066c2d5ae90c86ede695c4f3746634b9ec64db9de84a7d7402d773290967eaac5ea75286c0caf573e6899f585dd719aed7412d2cbf04eaf8e7b33892d61f
-DIST calculate-client-3.6.8.1.tar.bz2 31697 BLAKE2B 1af7b860dcb0ec2d8d17fd7c7a4120787ef22886748b6eca547d498e3f2571cb8e33c3208eacef0582dbfd92ade8838aef37ce241803ad5e365db147ae41648c SHA512 cd514235b6d1a70d1cf482009a547f89b1a3af0a68e2f11b446d0a05f317b07b6f820b4b2c41ed7417f5e5ed2ddc45d482962ed050c2234b26669c6fd490f796
 DIST calculate-client-3.6.8.2.tar.bz2 31700 BLAKE2B 2188029d5c92dd70d3e925fc04c0fd8769d5278aa495172bcc78ae8b92379cdbeae178c0777a03b6da943a1161376389011940c19e80ee675e9fdab8eef16643 SHA512 f0bd6bbdb3bd18322cd9f700a31ea11858a589d4868df0b8f043e768ebc2642f245f34d0d52563aef164589a1e224341a9968c3c46c54c2a1341ce28b6f3662f
-DIST calculate-client-3.6.8.tar.bz2 31612 BLAKE2B 9b1bf1b4b318b98fc6573323f6b527ecd8e89edac36144fd0352cc7e168e70783eac64a64c5188cf425e76f50439602dd6ce51c2d7837d68b545c0737d25fd18 SHA512 87db61f7d1218127f386fedd4aea1e7713462b255dec3ddcb8a27fa9e06f4a3d31d6d6f67a26aa2dbf01693e2e02552d6ed7f51f27a3695649ccc107631223b1
-DIST calculate-console-3.6.7.tar.bz2 24747 BLAKE2B 3f0e9a223b71a296225cf26d0904879144c20a623c59a1209470bcc5680f9f717585d25d650dcdf48a93d2fff864ab70ba30072c6218be504135acb11870479c SHA512 1210e7241362df7bfc0f7bcd6227fef54cdc6a0e1eb0c998f98c8bfc5ea36883ad948c5a8d11d997e30802cf5c1cf42334286676917ac00698659f7b97168138
 DIST calculate-console-3.6.8.tar.bz2 24777 BLAKE2B ae2a75832940a91f7dc169493269b736fc53f41f61bf0b62ff16be3cbbf0d4732a90e8a5f4d1574a64fa7701d266b2ee6f232946fb777d08db7cdf545580dc34 SHA512 4917a2662fed949c07c039721d9aba1cfe46171dfe942894c6d1811f26be278c20629e20586fbe1d3b2b374089e51ca68c104a7b80c2fd4d55d49f0f3f17ee7a
-DIST calculate-console-gui-3.6.7.1.tar.bz2 415353 BLAKE2B fdbb73f72a84d9007229018e8c4848a25bb32090114a778ec2c952e110d81692485b52e47664e3b5a6b60bf7e19e9ebbc5269936afae0f5ec33c402eba2408d1 SHA512 5c663ee0514d78c4bfe960f4790eec9dcdd4d1df1360963226f7cf846bd74c2362aede3b1f9fde7048c97a208bc80e6ecda72ae9e72241725c1ef3ddaeb93210
-DIST calculate-console-gui-3.6.7.tar.bz2 415026 BLAKE2B 43f4a62f7fcfa465f4d6f9c4f95cf05d65269f4a550a3e44159277339fc756d95526a6f290516316ecaa3c86820e86ca134d3b04e0ba8b54ea3cb70ad3caed56 SHA512 21b743d42db5b47465ad61b0a6ca55f4200b0960550108fffca8231ca525c2f9647171bfb2fd2f002ed6715140961dc3f96d4328c42ae1d7c2a2052b05119177
+DIST calculate-console-gui-3.6.8.1.tar.bz2 415776 BLAKE2B fa52866a3d8c2edde59aba33b5bd87e76efcda1a08152b1881a83ca12b079cee9b7ed5e3ac12bb0e5222e2749ba7c993f5cba0c1837d6da23056c02fc845355e SHA512 a5a0cf95444895ebc4481aaa9e65a62f3b0f893f7076ab694e6845e453192aa492bf9d4f5a0960574b68598d083e64329e6e2859916adaf9361576ab4145ffeb
 DIST calculate-console-gui-3.6.8.tar.bz2 414915 BLAKE2B a58033e66144fd9a7808210c32d16e1cb1e5ee8664f2d331f0ba803d64f36db956694c78922db9093fcc46f442eac029d4fbcf880dec10bd863d428eff56c2d1 SHA512 6ff64cb511adbcdafbc48854d43a250bc27fb6a8bd36bb74a4edd37453b6bb3335b7ec8860e52acb7902a50a791cd354cbdf3a45e2710e4833be23ebcb7d3c5e
-DIST calculate-core-3.6.7.4.tar.bz2 99063 BLAKE2B 4988983a1ac130893ca84ac886f2b4ea9c8ffb65520c0280d72bb0f509176af086bf07948d005aad4dcf9308232741ed828867216f01cb9509c4980afbf72c77 SHA512 74e08246edaf348d631aa432439b1878598097a546c3fe3ec84cf53f58a9874fcbc42cf097667030dcc134861c0e90f666f5ce1cba0ff5d66f7f7461b58a6f55
-DIST calculate-core-3.6.7.5.tar.bz2 98967 BLAKE2B ba5731a73e7d2f9b3b1c1f6a02f32a950e901116630338770a0b176cea2855eec7a5f88feea82c137a36718a0d08efc65b2541094468b01505780ba51b168c9b SHA512 15ea8c48969da76ba508ac9efc398d8c02d41937eeec8e5625e5bc942e11a4f47619d046ad8c8b7c5689dc3f1b64406b350591c73750c75eaaea9427030521e7
-DIST calculate-core-3.6.8.1.tar.bz2 99172 BLAKE2B 10436841eb23c2d5ac05f57ff9b80cd2824f2817860288e8b0c3dad101119dd177c02212a6552b2014df0d0a3eb0c76b0f5c4a5930396973f6d1c74e895fcdec SHA512 ede9b910c9f8d880caceb7782e1d17c37530323f05d85cddf741b6616f3ce2ca8806a54ebb5a0f50a7603d7506478d47c0dc8a089b9e252443a352b93a364319
-DIST calculate-core-3.6.8.2.tar.bz2 99117 BLAKE2B e67d38d4e29a343c878fafe1e66d16d5815655a2d8e638cb838114f2257b6496f3b64a33b982bf426df22e2aa54d369a67cd94422e49242e0fe085c166c07995 SHA512 4f83372b9b7a4f67f66062b2b5b4db31ee2010dbd3779314ce1dd48d7682c7a1b859cde67cd81bc33fc6a6be967250644e1f007ff6608664e7108422b7dc454e
 DIST calculate-core-3.6.8.3.tar.bz2 99184 BLAKE2B f6f1d4ae400fa06974a2d4590c7238a6f240372f85dd756ed022e8478238e53e6bb84c479e2837e58318c1afc7dea69c453cd52b02ce2ea88bf82a5fa0a0e1dc SHA512 398308ec7083aa1802cb7d5372c3b25ad91090a07f19c6442a20b2112961a487f8047476ccc97f7999d9c00f863621550879ad4c82649b456389a24e0b3b8e1e
-DIST calculate-core-3.6.8.tar.bz2 99061 BLAKE2B ede44f0aef88c0e22c65d78e478d74ead8eb98096221ba2e4c6b3275019460177c6c2febec3e5b860bf8413b2701991067fdb9e772d502e0b42b7b5fff97306a SHA512 c4d1d5a1d6c607cc95ca610958363cb9294ac1dc76def65ffff84b4d1e0ae3caea4cffcba04fced2cb33a076f7ef407991f5848d3f24d8d29ee85e086e4bf4ac
-DIST calculate-desktop-3.6.7.2.tar.bz2 18676 BLAKE2B 54a6b102c2dce801912c1f7bb035640316f68e43cc1953c05b7d94c187490889b8e60f0f2520d651bd705e71c404ad4dacd7702da9e67d9cf34e7b0ea1d5ca4a SHA512 a096c7e686d470c543cb12e79b31d84cf72f178cbde26a2960491aca0d09af7bbcd832c828463ba56d273ed640c26cdc6cdfd790e8473b2de8a4d737479f0738
-DIST calculate-desktop-3.6.7.tar.bz2 18600 BLAKE2B 042e570e8d2be2784ffcb20b2725062e290f6732183d412bea9e35d7cc1588c1705424d41d86a16625d932174b3eaed64af76d39576d251ecc7db1abc176e688 SHA512 090c5a7faf34b86fb89ec889c4cc77005451deb895e1d536f501f41e0c63d7c1bf1b4de93b88d18d9b1e50b46d14806999468771c062954fa9ae4ffac68795d1
 DIST calculate-desktop-3.6.8.6.tar.bz2 19026 BLAKE2B 98be46d6246c6402b65cc800a2618b80b95cc761931bc19fe146347a1ef29e7a19597f559d47823c3d8200b4e1cfb9355d2d95f508e726ec1b0550578a600951 SHA512 cd0f44855f4ec0ca402ed2d952677b6c065811d2d31a1a65c0b025bccaa0bfc31e4e692658cd4ae25b4325660f58b712953ab50ca90d422446a9fab154ff386f
-DIST calculate-desktop-3.6.8.tar.bz2 18658 BLAKE2B edca8d8f2dcd7178d3b4c7902f2d7df55a59bf8f9523391033da31ebaf10b357824a222735da3e7cb0810fcfa76b6c94ad16aa7c07ec6b4f9c633a87521063fd SHA512 83fd6ec63d3a5a97a386e36fa035c3c8ac9d08e00f51993966169ccb0e3b4c1dbac2286c05bb143cb17e811fee64403c95b76c4ff9c6a267eab61bef3299269b
-DIST calculate-i18n-3.6.7.12.tar.bz2 795314 BLAKE2B 359bc6de9821b1fcc69814d312978ff606b78c77502b28ea504b15c0851536f5f044bb03ae22edde5da302ce5d1aeac4389a6a00b8fe7cd57b7ef9161dd4c4a6 SHA512 27f2db6d2ce0e525e3150ec1867bc646fe9bcb3281d943cf09d8cf55fae8c9f994b9fb3168223918877bc3d361a6d413ccdd6ebe08b2ffd1db1db818b890f10b
-DIST calculate-i18n-3.6.7.9.tar.bz2 791410 BLAKE2B 3ed3329285e188244503f4a98dacc3833a1b4a9316f021583f5e637f922468fa6c54bf0da99a08135415ac87fb98c7a939180749ec14b01dfc302ca01ace822b SHA512 a0d06050b8a1c1ed9b559f183c585fbb051126564decaa3ebc6e7707a8824d05d0a86f1e62139f97e85a60a38cc0f20b493390c73c5739c274a9fc809f346bc5
-DIST calculate-i18n-3.6.8.2.tar.bz2 807069 BLAKE2B a33c8c7b802671d3537e1e9647dd9c12dfaa8aae55021f76a6d9c4961762bd9daa545ef12fe25e9ed220a77fbde87d13e6b06d5e42ac3f996b0826b5f9cfb0c6 SHA512 3e2f3abe3e42536768a566ca70b93c8ca51078b16fb9bf1bf3cf44bea69c434f7625019eb67be4c224dae50d296894a1b0508bb03d996939546bafda4789647f
-DIST calculate-i18n-3.6.8.3.tar.bz2 811082 BLAKE2B a67d7c795030660759595e8397567be216648cb6c3c25c3e7dafd364ed8544e2c7799d9a3f92e68335b36fbd3ba0462580fbaa5ac095c6cc054f358249b5bf15 SHA512 603bbbd93968c0dc75745e13f8a159d2e5df89b1235cd78013b00cb3c620d6fb7f4c4f7ff33b335c767b46fbb02d1f733cdb7b5d2f8774e551ab117c58f3e5a0
 DIST calculate-i18n-3.6.8.4.tar.bz2 814984 BLAKE2B 652cb46f5dbac3521f927442980e6c15b8cd3d7531bf9da1d88b7535e6ff3aba6f372590ea70f41322194c117feedf0822348181b41f4f66fec3eb9b7ef2ea48 SHA512 53c1679edb07cd12bdf5bbd76c55a663a89417e84ed863f61c44e962247e9380448120f59b8ef64e400ea922b70c136bd6dac7a35f9caf39878ec13e94979258
 DIST calculate-i18n-3.6.8.5.tar.bz2 822332 BLAKE2B eabc80fc1428424940d324c409bf5482da404b57ccb75b846c0144c4f027ab230ea12d28ad1c2ea1f4e764cfdfb9bcc1bb511f0c5557a6273c41929b4fd71ae2 SHA512 7280635b8e3cca00d34a436b4e5fac26b46fd75ddbf1acef0638e058a6939566ebba3e16edded75e001f93ebfa0c325c763c71847f612f82762d3057684d5011
-DIST calculate-i18n-3.6.8.tar.bz2 795693 BLAKE2B 309cdb50908458d9c65303a7de2efc78e6cfc4ca8191efba31f409e0bd364e1ba01cc97f9af908c2a8760d3cbe8262f08f6e96e2a026545b5111616cc54fea36 SHA512 81b31c7b1a6938c6822dd52096c488b8e06d144c8a1bf8689e3f33212cf86fced43174d33112873460f1a986817d2c42640e1dd519935717862e3ee422cf6d57
-DIST calculate-install-3.6.7.11.tar.bz2 84287 BLAKE2B f11ad4fc84fd63f6a495fc96d484e78ac8b9549966337839870aff2b3f455df43bf5bf45a7f565a0494b97daadffb5fdc48137c3a9694cb9f3fabbdaadd18fc3 SHA512 29f39a7897a504d5a8607faa89d7473f1452150e334bcf9903cbec05ab1e4b112a0059b40f56bcaec99e79d26ec70f136626ab2257c1242c3ba087a64818cd00
-DIST calculate-install-3.6.7.15.tar.bz2 84562 BLAKE2B 1c5e41270667ea78bd556f91d11b17acc913de0083126f61dfa2c6fe2681229032ae8ae9ebeb6ff9a6c648686c6b1cc475ca4336c591508d4f783655ec710552 SHA512 22ba2692fa7a7ad9e672cce0d9b224de96e7c6bdb0be4dd11320e578f55e015bc13ac68c6c11d18a4d14049f430e3b17c36627f96a8ed3a2bb8b5fcb24d01a64
 DIST calculate-install-3.6.8.3.tar.bz2 85148 BLAKE2B d29789524892e0753343c82dcade0496855f696b9580ae4c20c341e12c85c0a9da3975994dffc12ddcddf3cbfe9cae1c62a78919c4365c06095a00045f07dc02 SHA512 c2bcb7b3c60f2eff163a0e7884f729e2186ccfdbdb95dcc02d23738972c6ecdea3769127315513c076d6fd03b54e911d5520b92a8a311c7f5195ca8f836b706d
-DIST calculate-install-3.6.8.tar.bz2 84605 BLAKE2B beb37899a263c16155d1fd20e94102612ffc3b44fc28a7ca15038f83c1e127cc87be6bf3884baa590a8f04f7f0e7fd2b97dd73664abae2f6407be26c7c404ca6 SHA512 f3c6f146ef25b717fb24a2e98e4d4ea340009163438680726a705d500bcd8b4f4ae2b83ee0c7aaf64ba780d9dd14bc2414a35b3531a47f86f4552b9a837c2413
-DIST calculate-ldap-3.6.7.tar.bz2 11916 BLAKE2B 00ce9c810a85ab806d023797ea1b04b4e4dac74f8ce0a6d5258f03a4faffa269db9f5000ed61c85f1d1a2855285953f375b4b4740307046c44bc56cb9f0b7e3e SHA512 77e78c13b8eb2d08f778c885fff9d6f57904fcdf8fa5e096f9062dc7c1cadc9edd5055c91a355d9fda0fa78b78c043e9ce6e780b1d6da64d7b59ad762eeb877e
 DIST calculate-ldap-3.6.8.tar.bz2 11923 BLAKE2B 473714789c6583bf577dca15cc60c125e6ffdb0f8d1fdc14e33209fc76540c380552cbd2064d97ce6c36fd3009b0acfd628360a09006c4a96fb14a735eac53f1 SHA512 aa84559b6571367946b46ad708a9dcad49afc92ad7d2cbf4e24d9665d4482007d66f80e39e988ed7ab79f2da367ca27923fe88ed3918ef4d82fe9493a438beaf
-DIST calculate-lib-3.6.7.18.tar.bz2 378586 BLAKE2B 246431ee193ff099ef61bf9c142f363f799918d500e06d04b034bf129f8f05185f3c892c07b73e97de84474b17b978e34f7d8801909090dcfb6c3d292e33293f SHA512 20a16a52f470e947bbbc09d4a36c8290c10413845d25a2e4beb093ed76bb3f0a28b1803b4bb27a059b34b9e78b8b490b76247f729adcad92ee0d03a85e8019ba
-DIST calculate-lib-3.6.7.22.tar.bz2 379556 BLAKE2B 6288199c7d39e5465c851f8bcdab067da352b92c3cabc9fb6befbda4108176185d24b30e8451dacd78e3f27c4407b71242c1439a0c0cf610f8d1db85cbf3c0db SHA512 b3ac228c3335a7c8a36a7c1e7db1c367d562c68fe6e62abcc6feb0a8fb1127926b1cb2432411c711fa30bbfdff64ac85687126c8be76ed2de708aedb99194c69
-DIST calculate-lib-3.6.8.5.tar.bz2 617672 BLAKE2B 6e6b18ccb14bf0b9e8993f5c82a5c2a5a511e916c2f781e6eabf1429d6a9bb0d383bab76f6867b1f974bc31b19aa1b0c21cf629a5707fd2e2c358b6b986c0057 SHA512 13e67d2fa91523285ae106440840cf43d4d55fa33f6f0675eb76212aaeee234bc1073b7ebdc0c2bf45831ac5f3d33093ed6c7ddcf97cf028fc3524b26833ba60
 DIST calculate-lib-3.6.8.7.tar.bz2 618084 BLAKE2B 6d15becc0e6e88b6f5c9d4234ecc09d2270e7c46a6a8165f33dfd415c23aa0fc93374c74616a49efa69f7f91d25708acfea91d3ca4051b8e40da48cbd8d4ddda SHA512 68ce28e92223a47f4c083599e31021813828b6521b7d494ff6874ab42d9c3c89853a8218d97072962a463e68f220d817aa597c07ad975d8250828477d341b12b
-DIST calculate-lib-3.6.8.tar.bz2 379164 BLAKE2B 586757a466d878982f0f687fc76509776032fbf453c5376ba287468d6174b8ca20c7a48c97a4a38a65b05896ad79e66549b8f17bcd2e86550aee475387de15e2 SHA512 2b0f38e0acd82e22d53e24e8591ff92dff4ec7373df01b367e8e3f8aec4a3e39e11c9fd2a7cb8dcc19aa932a35d18a25654b37501b2abf1cc89f59573fcef12a
-DIST calculate-server-3.6.7.tar.bz2 6637 BLAKE2B 2b071f241b712466667fd1757b59955a8345257ce9c44e6f870ef02b754a34260c605391dec9956349c43b8d869b8020662a54b44d89570f6483dce55d796c36 SHA512 1ccd1ce1acea05acaef14bb1341d91551a5d9e7bfa997c94bf441862dcdc4df64bf3c83b1c033ce841178809f2ab709fee2ace3ea43c34199085b216eb7db563
 DIST calculate-server-3.6.8.tar.bz2 6646 BLAKE2B e8900478cac290c3d3de491e505ea1b691907dbf3b37d959177e191d89360d52e1a4c46cb2e6be4f629aad2ae34c81b3372c47805c2842f766540af86103b039 SHA512 e88163b35a868295cb16a485dbe8d0eb50f11eb67ee34e02d3b27dccb394887cb9448e124767caaa3fefd2776b9e3ae5e31a9ec7af74d5da81635386f7a6ea7b
-DIST calculate-unix-3.6.7.tar.bz2 21737 BLAKE2B 8dafee85031cc56b6c171236f37aca9f7942213d930e6c4e4596243163c0599334a19b1cd708cab48468a841c5e2716d714426cc07de113ef66fa87592a55463 SHA512 a6dd3760b139f025499ed095ad981bb73cc0b0529ee0da4a893bbf9af5f9817e199d5d1f27ffe9d00bca9fb435afd804a23737e55ac9c7a93eea5048f6204855
 DIST calculate-unix-3.6.8.tar.bz2 21691 BLAKE2B 9247c1c5be8ee4b00dd9be6f57ebe320a33413c95d93ee46aeaa2001e39c04fb31fb97ce5ce64c0d7ff3cadc1564cfa30d5ae50f89e711ebcc87f7d378d57db9 SHA512 6952992c1f74ad0243e83f14ad0b87641a475d179b99ba3b17d4b49ab5e49ad75d9ee027af166933d28687f04bd090cd594860af4514a46651161b2b877b70a7
-DIST calculate-update-3.6.7.10.tar.bz2 38203 BLAKE2B 09fb084737d5941d66d16c5c42a1fb8a39769d9e1fd01031b5085214c0377d0846ed955630a7b17163d399de7abf742c27d8d5599f230ed9bb89034c0174616b SHA512 d1e82a9b71885c1ade52326ef7e1bc12edd35368c49079dcd7003e68eae1baef21f8c65df68b66c54b8cd5346d9660d9de1045102d8eafba07c13c1e93b832d8
-DIST calculate-update-3.6.7.8.tar.bz2 38010 BLAKE2B c43f22fbf9cb2b0ff7d0baa6c2aec62a7056d47e5fca84adc88d1795298b767570573b70f40341dd27280d888dcd3a49311685f0d80be8c997b3156dd86b4b7a SHA512 4f42483d1ab1338068f442d73aef187ce436c38c2929dcce5ae2b11f86bb603c237f306a0997cfa6fd4e19aa9285a6fa6e6576468c545dec37938fc10db8d2fe
 DIST calculate-update-3.6.8.tar.bz2 38159 BLAKE2B ee6cea1dda68f85fed80a80075461356d8105eaca99de5002bacf3f60a64b5fa003d5fdcfb1af09c8c56f5f675eef59a862cdcaac8fc4861b6bdb539cc88cde0 SHA512 f477cbb9fd22cc4e60c02e973b32957ea0e4b8b68d2cf65939b75a1acaa7327364a032e0fb9277e115247a8d825914685a6e6adc5f994d031c2f406fb05f7069
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.32.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.32.ebuild
deleted file mode 100644
index 6a1534f51..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.32.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.18"
-	["install"]="3.6.7.11"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.9"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.7"
-)
-
-inherit calculate-utils-r8
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.42.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.42.ebuild
deleted file mode 100644
index d190678b1..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.42.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.22"
-	["install"]="3.6.7.15"
-	["core"]="3.6.7.5"
-	["i18n"]="3.6.7.12"
-	["desktop"]="3.6.7.2"
-	["console-gui"]="3.6.7.1"
-	["update"]="3.6.7.10"
-	["builder"]="3.6.7.12"
-)
-
-inherit calculate-utils-r8
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8-r1.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8-r1.ebuild
deleted file mode 100644
index 882bba4d4..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-inherit calculate-utils-r8
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.1.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.1.ebuild
deleted file mode 100644
index a62f4bcad..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["core"]="3.6.8.1"
-	["desktop"]="3.6.8.6"
-)
-
-inherit calculate-utils-r9
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.8-r2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.12.ebuild
similarity index 87%
rename from sys-apps/calculate-utils/calculate-utils-3.6.8.8-r2.ebuild
rename to sys-apps/calculate-utils/calculate-utils-3.6.8.12.ebuild
index a7ab630bd..412c1a7d3 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.8-r2.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.8.12.ebuild
@@ -9,12 +9,13 @@ declare -A CALCULATE_MODULES=(
 	["lib"]="3.6.8.7"
 	["install"]="3.6.8.3"
 	["core"]="3.6.8.3"
-	["i18n"]="3.6.8.2"
+	["i18n"]="3.6.8.5"
 	["client"]="3.6.8.2"
 	["desktop"]="3.6.8.6"
+	["console-gui"]="3.6.8.1"
 )
 
-inherit calculate-utils-r10
+inherit calculate-utils-r11
 
 DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.2.ebuild
deleted file mode 100644
index 332b75a61..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["core"]="3.6.8.2"
-	["desktop"]="3.6.8.6"
-)
-
-inherit calculate-utils-r9
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.3.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.3.ebuild
deleted file mode 100644
index 482c515b3..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["core"]="3.6.8.2"
-	["client"]="3.6.8.1"
-	["desktop"]="3.6.8.6"
-)
-
-inherit calculate-utils-r9
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.7.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.7.ebuild
deleted file mode 100644
index ab38fd87d..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.8.5"
-	["core"]="3.6.8.2"
-	["i18n"]="3.6.8.2"
-	["client"]="3.6.8.1"
-	["desktop"]="3.6.8.6"
-)
-
-inherit calculate-utils-r10
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.9.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.9.ebuild
deleted file mode 100644
index c992a5f42..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.8.7"
-	["install"]="3.6.8.3"
-	["core"]="3.6.8.3"
-	["i18n"]="3.6.8.3"
-	["client"]="3.6.8.2"
-	["desktop"]="3.6.8.6"
-)
-
-inherit calculate-utils-r10
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.8.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.8.ebuild
deleted file mode 100644
index 882bba4d4..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-inherit calculate-utils-r8
-
-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"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
index 204642aac..ba4f67deb 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 PYTHON_COMPAT=(python2_7)
 
-inherit calculate-utils-r8 git-r3
+inherit calculate-utils-r11 git-r3
 
 DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"