diff --git a/eclass/calculate-utils-r6.eclass b/eclass/calculate-utils-r6.eclass
deleted file mode 100644
index 75ab17ce4..000000000
--- a/eclass/calculate-utils-r6.eclass
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: calculate-utils-r6.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 versionator
-
-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:=$(get_version_component_range 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/cherrypy[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
-	dev-python/progressbar[python_targets_python2_7]
-	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_python2_7]
-	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
-	)
-
-	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-r6_src_compile
-# @DESCRIPTION:
-# Compile all modules of calculate utils
-calculate-utils-r6_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-r6_src_install
-# @DESCRIPTION:
-# Install all modules of calculate utils
-calculate-utils-r6_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-r6_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/eclass/calculate-utils-r7.eclass b/eclass/calculate-utils-r7.eclass
deleted file mode 100644
index 8e7138cc4..000000000
--- a/eclass/calculate-utils-r7.eclass
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# @ECLASS: calculate-utils-r7.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_python2_7]
-	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
-	)
-
-	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-r7_src_compile
-# @DESCRIPTION:
-# Compile all modules of calculate utils
-calculate-utils-r7_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-r7_src_install
-# @DESCRIPTION:
-# Install all modules of calculate utils
-calculate-utils-r7_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-r7_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/calculate-utils-3.6.6.2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.6.2.ebuild
deleted file mode 100644
index fe2830fd3..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.6.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.6.4"
-	["install"]="3.6.6.1"
-	["i18n"]="3.6.6.1"
-	["update"]="3.6.6.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.6.3.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.6.3.ebuild
deleted file mode 100644
index a999b66fd..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.6.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.6.5"
-	["install"]="3.6.6.2"
-	["i18n"]="3.6.6.1"
-	["update"]="3.6.6.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.6.4.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.6.4.ebuild
deleted file mode 100644
index 132b104d7..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.6.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.6.7"
-	["install"]="3.6.6.3"
-	["i18n"]="3.6.6.1"
-	["update"]="3.6.6.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.6.5.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.6.5.ebuild
deleted file mode 100644
index 8f90cf43a..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.6.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.6.7"
-	["install"]="3.6.6.4"
-	["i18n"]="3.6.6.1"
-	["update"]="3.6.6.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.1.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.1.ebuild
deleted file mode 100644
index 0db16d606..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.2"
-	["i18n"]="3.6.7.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.10.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.10.ebuild
deleted file mode 100644
index dee46a82c..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.10.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.10"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.4"
-	["update"]="3.6.7.2"
-	["builder"]="3.6.7.4"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.14.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.14.ebuild
deleted file mode 100644
index 6e58d0072..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.14.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.10"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.4"
-	["update"]="3.6.7.6"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r6
-
-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.15.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.15.ebuild
deleted file mode 100644
index f0c2d1302..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.15.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.11"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.4"
-	["update"]="3.6.7.6"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r6
-
-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.16.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.16.ebuild
deleted file mode 100644
index 9e674bc28..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.16.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.11"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.6"
-	["update"]="3.6.7.6"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r6
-
-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.17.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.17.ebuild
deleted file mode 100644
index 4531b9409..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.17.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.12"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.7"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r6
-
-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.18.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.18.ebuild
deleted file mode 100644
index 3fdb9293d..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.18.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.13"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.3"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.7"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r6
-
-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.19.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.19.ebuild
deleted file mode 100644
index 6aba9731d..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.19.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.14"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.7"
-	["builder"]="3.6.7.5"
-)
-
-inherit calculate-utils-r7
-
-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.2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.2.ebuild
deleted file mode 100644
index f40f63016..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.3"
-	["install"]="3.6.7.1"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.2"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.20.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.20.ebuild
deleted file mode 100644
index e02985b26..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.20.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.14"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.7"
-	["builder"]="3.6.7.6"
-)
-
-inherit calculate-utils-r7
-
-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.21.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.21.ebuild
deleted file mode 100644
index 11f84df57..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.21.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.14"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-inherit calculate-utils-r7
-
-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.22.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.22.ebuild
deleted file mode 100644
index f6ee04f03..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.22.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.14"
-	["install"]="3.6.7.8"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-inherit calculate-utils-r7
-
-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.23.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.23.ebuild
deleted file mode 100644
index 1f53d4351..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.23.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.15"
-	["install"]="3.6.7.8"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-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.24.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.24.ebuild
deleted file mode 100644
index cec36cc35..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.24.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.16"
-	["install"]="3.6.7.8"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-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.25.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.25.ebuild
deleted file mode 100644
index 6f96a895e..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.25.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.16"
-	["install"]="3.6.7.9"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-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.26.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.26.ebuild
deleted file mode 100644
index 7ff38f45e..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.26.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.16"
-	["install"]="3.6.7.10"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-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.27.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.27.ebuild
deleted file mode 100644
index 92aec2265..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.27.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.17"
-	["install"]="3.6.7.10"
-	["core"]="3.6.7.4"
-	["i18n"]="3.6.7.7"
-	["update"]="3.6.7.8"
-	["builder"]="3.6.7.6"
-)
-
-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.3.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.3.ebuild
deleted file mode 100644
index f8b4abdf9..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.3"
-	["install"]="3.6.7.2"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.2"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.4.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.4.ebuild
deleted file mode 100644
index 82fa5a641..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.4.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.4"
-	["install"]="3.6.7.4"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.2"
-	["builder"]="3.6.7.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.5.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.5.ebuild
deleted file mode 100644
index 9500c3d05..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.5.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.4"
-	["install"]="3.6.7.5"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.2"
-	["builder"]="3.6.7.2"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.6.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.6.ebuild
deleted file mode 100644
index cd42c9e50..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.6.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.4"
-	["install"]="3.6.7.6"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.3"
-	["update"]="3.6.7.1"
-	["builder"]="3.6.7.3"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.7.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.7.ebuild
deleted file mode 100644
index f6e0286f4..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.7.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.7"
-	["install"]="3.6.7.6"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.3"
-	["update"]="3.6.7.1"
-	["builder"]="3.6.7.3"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.8.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.8.ebuild
deleted file mode 100644
index 1ad5f284b..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.8.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="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["lib"]="3.6.7.8"
-	["install"]="3.6.7.7"
-	["core"]="3.6.7.1"
-	["i18n"]="3.6.7.3"
-	["update"]="3.6.7.1"
-	["builder"]="3.6.7.3"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.7.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.7.ebuild
deleted file mode 100644
index 2b54d6047..000000000
--- a/sys-apps/calculate-utils/calculate-utils-3.6.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-PYTHON_COMPAT=(python2_7)
-
-declare -A CALCULATE_MODULES=(
-	["i18n"]="3.6.7.1"
-)
-
-inherit calculate-utils-r6
-
-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="x86 amd64"
-