diff --git a/x11-themes/calculate-icon-theme/Manifest b/x11-themes/calculate-icon-theme/Manifest
index 33063706e..3f5c4a060 100644
--- a/x11-themes/calculate-icon-theme/Manifest
+++ b/x11-themes/calculate-icon-theme/Manifest
@@ -1,3 +1,2 @@
 DIST icon-calculate-13-r2.tar.bz2 720922 SHA256 58d838c34a08a6803199d4f8cde24619cf4e4c686f541caf477a2ebe01b907eb SHA512 c228e26ee1a971ccfad7b40f9429b8b270aaa32ae34743dd144348289745352145c4e0dcd549b0b980ebe7d0ba560d7d92f78c4a8df9a2e5c1079a4528f5e329 WHIRLPOOL d0be2e66bdbcd83e6b1b320c2649dfa73e9a588bd85f4bc29e342fc651bea016546b65822c847ed325754b9fff6474a8eb087a9d8fca8465270fb8ef96198bd1
-DIST icon-calculate-14-r2.tar.bz2 399285 SHA256 d5e733741cd167fb0de27550ca634bc104b2ec26f2bc04b6261379cafa6e3fd4 SHA512 814c93995a1f28a7d6fa87cdfe484cb5661ff621ce84c46307301abe7a20d178543189414abb8cd0d415260e1cccb5cf4f9382ae58572236f74ffe25e11fa1ba WHIRLPOOL 697955160370ea64362b81535c9259db51923f39ae77b9028ab9f4d18b07892c31fd854f0d0cc224587ad65c8e0251fe18b73e1151f84e91c4d520e1aaef1688
 DIST icon-calculate-14-r3.tar.bz2 498448 SHA256 861cfcd9f35d9d9d27a4a00bc16c6b84484a8e4e1e4f12881f7890eaf9c3f329 SHA512 539f739b7675097c6eef13429aeb6d2e75356b62eca0801baeb4eb6a1e0a8a5b8ceb288b8bdefb04de2aa7f698f9045774acaeb2367bcb69dd057f32ef098046 WHIRLPOOL b1914ee603ab70fc184ec2567c78e44ce48aa1073964e2d1f540e77f20fb47f5fbe936525e7fe832c6e4ca3aadf971b578178bf400c101792bd5e8bf47482e73
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r3.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r3.ebuild
deleted file mode 100644
index 0992e2dd0..000000000
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit gnome2-utils
-
-DESCRIPTION="Icons theme for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="themes_CLD themes_CLDX themes_CLS
-themes_CLDG"
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/icon/icon-calculate-14-r2.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-14-r2.tar.bz2"
-
-REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLDG )"
-
-RDEPEND="themes_CLD? ( kde-apps/oxygen-icons )
-	themes_CLDG? ( x11-themes/gnome-icon-theme )
-	themes_CLDX? ( x11-themes/elementary-icon-theme )
-	!media-gfx/cldx-themes
-	!media-gfx/cld-themes
-	!media-gfx/cldg-themes
-	!media-gfx/cls-themes"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	if use themes_CLD
-	then
-		sed -ri 's/Inherits=.*/Inherits=oxygen,hicolor/' usr/share/icons/Calculate/index.theme
-		rm -r usr/share/pixmaps/gnome
-		mv  usr/share/pixmaps/oxygen usr/share/pixmaps/faces
-	else
-		rm -r usr/share/pixmaps/oxygen
-		mv  usr/share/pixmaps/gnome usr/share/pixmaps/faces
-	fi
-	if use themes_CLDG
-	then
-		sed -ri 's/Inherits=.*/Inherits=gnome,hicolor/' usr/share/icons/Calculate/index.theme
-	fi
-	if use themes_CLDX
-	then
-		sed -ri 's/Inherits=.*/Inherits=elementary,hicolor/' usr/share/icons/Calculate/index.theme
-	fi
-	insinto /
-	doins -r .
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r5.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r5.ebuild
deleted file mode 100644
index a6067b2e4..000000000
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit gnome2-utils
-
-DESCRIPTION="Icons theme for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="kde"
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/icon/icon-calculate-14-r2.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-14-r2.tar.bz2"
-
-RDEPEND="kde? ( kde-apps/oxygen-icons )
-	!kde? ( x11-themes/elementary-icon-theme
-			x11-themes/gnome-icon-theme
-	)"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	if use kde
-	then
-		rm -r usr/share/pixmaps/gnome
-		mv  usr/share/pixmaps/oxygen usr/share/pixmaps/faces
-	else
-		rm -r usr/share/pixmaps/oxygen
-		mv  usr/share/pixmaps/gnome usr/share/pixmaps/faces
-	fi
-	insinto /
-	doins -r .
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r6.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r6.ebuild
index dd7b0c945..31f5e8395 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r6.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-14-r6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="kde"
 
 SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/icon/icon-calculate-14-r3.tar.bz2