diff --git a/app-dicts/stardict-calculate-ru/stardict-calculate-ru-1.0.ebuild b/app-dicts/stardict-calculate-ru/stardict-calculate-ru-1.0.ebuild
index 17bd13b60..dc372e031 100644
--- a/app-dicts/stardict-calculate-ru/stardict-calculate-ru-1.0.ebuild
+++ b/app-dicts/stardict-calculate-ru/stardict-calculate-ru-1.0.ebuild
@@ -4,8 +4,8 @@
 DESCRIPTION="The collection of Russian-English dictionaries"
 HOMEPAGE="http://www.calculate-linux.org/packages/app-dicts/stardict-calculate-ru"
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/eclass/calculate-utils.eclass b/eclass/calculate-utils.eclass
index d27960740..a9b77c543 100644
--- a/eclass/calculate-utils.eclass
+++ b/eclass/calculate-utils.eclass
@@ -16,8 +16,8 @@ inherit distutils-r1 eutils versionator
 
 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"
+CALCULATE_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate3"
+MIRROR_URI="http://mirror.yandex.ru/calculate/source/calculate3"
 
 # @ECLASS-VARIABLE: CALCULATE_MODULES
 # @DESCRIPTION:
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
index 701523455..edf95b022 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
@@ -14,18 +14,18 @@ VERSION_IUSE="CL11 CL12 CL13"
 IUSE="+CL11 +CL12 +CL13"
 
 SRC_URI="
-	ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
index b4ca6b82f..123b64d49 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
@@ -14,20 +14,20 @@ VERSION_IUSE="CL11 CL12 CL13 CL14"
 IUSE="+CL11 +CL12 +CL13 +CL14"
 
 SRC_URI="
-	ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
-	ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
-		ftp://ftp.calculate.ru/pub/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+		ftp://ftp.calculate-linux.org/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
index d4276f39d..177328668 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
@@ -14,16 +14,16 @@ IUSE="themes_CLD themes_CLDX themes_CLS
 themes_CLDG"
 
 SRC_URI="themes_CLD? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-cld-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cld-13.tar.bz2
 )
 themes_CLDX? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-cldx-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cldx-13.tar.bz2
 )
 themes_CLDG? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-cldg-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cldg-13.tar.bz2
 )
 themes_CLS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-cls-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-cls-13.tar.bz2
 )"
 
 REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG )"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
index bab7fbead..d6d20905b 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-14-r4.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-14-r4.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/dm/dm-14-r4.tar.bz2"
 
 RDEPEND=""
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
index 8203e4960..3df48b41d 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/dm/dm-15.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/dm/dm-15.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/dm/dm-15.tar.bz2"
 
 RDEPEND=""
diff --git a/media-gfx/gdm-themes-calculate/gdm-themes-calculate-13.ebuild b/media-gfx/gdm-themes-calculate/gdm-themes-calculate-13.ebuild
index 5fd9b833c..5aa5d6eea 100644
--- a/media-gfx/gdm-themes-calculate/gdm-themes-calculate-13.ebuild
+++ b/media-gfx/gdm-themes-calculate/gdm-themes-calculate-13.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/gdm/gdm-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gdm/gdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gdm/gdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
index 4ad689d6e..f53ca68a7 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
index 4ad689d6e..f53ca68a7 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
index 020b5be3a..29e4d8778 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
index 76ab037ca..a3e0a85db 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
@@ -14,25 +14,25 @@ IUSE="themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS themes_CDS themes
 
 SRC_URI="
 themes_CLD? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cld-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cld-13.tar.bz2
 )
 themes_CLDX? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cldx-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cldx-13.tar.bz2
 )
 themes_CLDG? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cldg-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cldg-13.tar.bz2
 )
 themes_CMC? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cmc-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cmc-13.tar.bz2
 )
 themes_CLS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cls-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cls-13.tar.bz2
 )
 themes_CDS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-cds-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-cds-13.tar.bz2
 )
 themes_CSS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-css-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-css-13.tar.bz2
 )"
 
 REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
index 59ba48457..f4ff4c80d 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-14-r1.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-14-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/grub/grub-14-r1.tar.bz2"
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
index 653b01c80..efdca40fb 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/grub/grub-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/grub/grub-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/grub/grub-${PV}.tar.bz2"
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
diff --git a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-13.ebuild b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-13.ebuild
index 032da057a..4d1349d5b 100644
--- a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-13.ebuild
+++ b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-13.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-14-r1.ebuild b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-14-r1.ebuild
index 96a2b057c..2318ac65c 100644
--- a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-14-r1.ebuild
+++ b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-14-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/kdm/kdm-calculate-${PV}-r1.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/kdm/kdm-calculate-${PV}-r1.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/kdm/kdm-calculate-${PV}-r1.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-15.ebuild b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-15.ebuild
index 85e7b58a6..2ae05a9b5 100644
--- a/media-gfx/kdm-themes-calculate/kdm-themes-calculate-15.ebuild
+++ b/media-gfx/kdm-themes-calculate/kdm-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/kdm/kdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/lightdm-themes-calculate/Manifest b/media-gfx/lightdm-themes-calculate/Manifest
index bbf9f29be..3cc3eb84b 100644
--- a/media-gfx/lightdm-themes-calculate/Manifest
+++ b/media-gfx/lightdm-themes-calculate/Manifest
@@ -1,4 +1,2 @@
-DIST lightdm-calculate-14-r1.tar.bz2 55142 SHA256 92946f109c2a3dd75a40c94bd17d99293aa2a8d3dd9d90800daaf5b22b45c081 SHA512 4141e097f5c846d819228caa7bd8c49ce7ab64c1be3c1d614627687ccc7f58d416a258e5a509ffd857f30314471c132d6a23042fe2774800eccb12219943f82b WHIRLPOOL 040683db053ae86cf56edb841531cdb1bee3d843f604a13de1a2fa9f5064a611f2e6e4ac8afc9711cd3565eb8e64d1fc084e1baf81ab4b662df3867e31b5e1fb
-DIST lightdm-calculate-14-r2.tar.bz2 55186 SHA256 39a54c6147b1cf04b9d84928260f1f9b1dfdf344c77adea3dc954837551f42f9 SHA512 2093aac6322a502a7688d096ab7c999d60c0a15fc59513a72e02ff09b67ce3500cf41417a1f9f87de795a37cdeac07b6d57c8a60b12811338dc52094ee7ba3b8 WHIRLPOOL 666a150a589b17e32a5080b700ff518bf3b31a14f4646b2fad2ab6ec4ce9b8ed9f46693aee81d8378c496721ebd5446d230186372b1ffe3a6681bd3013d4a28c
 DIST lightdm-calculate-14-r3.tar.bz2 55259 SHA256 8a1e5e30c29fb2939cdf0f1dbe3d0f7084037a20528b7c4130432b4b0b534acb SHA512 1f7e7c1f875b298c6ea2891a82f2fff5a37412d7b7e68fec82b8618fc4d86a6087c1e6fa81104f9bb21a9b349d6361dcf75cb0b7c80a27d9139823493e9ff713 WHIRLPOOL 7f60384267204753270f26f0db23a240eb74d3507804236e935e44f44238dab655a96dd7b37ce1ef57f4e8468402023217a1f40ecf45035b83c82ee5067aa6eb
 DIST lightdm-calculate-15.tar.bz2 55251 SHA256 6399205191b1d92e9b85bf59007b2a86418944bc5ea95fc8ea48dd718ff75a06 SHA512 63c4b179060ba6ca8142252af213a7c26a156dd49f539ef6747df0cffcfd89cd054d0570cdbcbe0199a1abb7984ad4fe5b95441ab262d195569d53a4086aa172 WHIRLPOOL 9a71c81460ec4d8ec7ac5292c1cdc753962389b907eeada39bbffcf674cdbc445a5c0630684389a4bdaafa04c385fedaf084e3ede2e3785167e95c56af6e4dc6
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r1.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r1.ebuild
deleted file mode 100644
index 0f4850011..000000000
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Lightdm themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
-
-RDEPEND="~media-gfx/dm-themes-calculate-${PV}
-	x11-themes/gtk-engines-murrine
-	x11-misc/lightdm-gtk-greeter"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r2.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r2.ebuild
deleted file mode 100644
index 0f4850011..000000000
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Lightdm themes for Calculate Linux"
-HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
-
-RDEPEND="~media-gfx/dm-themes-calculate-${PV}
-	x11-themes/gtk-engines-murrine
-	x11-misc/lightdm-gtk-greeter"
-
-DEPEND="${RDEPEND}"
-
-src_install() {
-	insinto /
-	doins -r .
-}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
index 0f4850011..4cc91232a 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
index 6b29f0eb7..5cffb005b 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
diff --git a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
index e9ac7d9dd..16d3a46cf 100644
--- a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
+++ b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
index c0ca5958e..afbe2dbe6 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
 
diff --git a/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-14-r4.ebuild b/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-14-r4.ebuild
index 9bde7f80a..68a7d4473 100644
--- a/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-14-r4.ebuild
+++ b/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-14-r4.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/plymouth/plymouth-calculate-14-r9.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plymouth/plymouth-calculate-14-r9.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plymouth/plymouth-calculate-14-r9.tar.bz2"
 
 RDEPEND="sys-boot/plymouth
diff --git a/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-15.ebuild b/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-15.ebuild
index c3356b938..676c20ff6 100644
--- a/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-15.ebuild
+++ b/media-gfx/plymouth-themes-calculate/plymouth-themes-calculate-15.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/plymouth/plymouth-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/plymouth/plymouth-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/plymouth/plymouth-calculate-${PV}.tar.bz2"
 
 RDEPEND="sys-boot/plymouth
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
index 3b62b5f45..f7154c3a7 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/splash/splash-themes-calculate-15-r2.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/splash/splash-themes-calculate-15-r2.tar.bz2"
 
 RDEPEND="media-gfx/splashutils
 media-fonts/droid
diff --git a/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-13.ebuild b/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-13.ebuild
index 3b7b4b8dd..93e5a8c29 100644
--- a/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-13.ebuild
+++ b/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-13.ebuild
@@ -14,25 +14,25 @@ IUSE="themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS themes_CDS themes
 
 SRC_URI="
 themes_CLD? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cld-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cld-13.tar.bz2
 )
 themes_CLDX? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cldx-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cldx-13.tar.bz2
 )
 themes_CLDG? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cldg-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cldg-13.tar.bz2
 )
 themes_CMC? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cmc-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cmc-13.tar.bz2
 )
 themes_CLS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cls-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cls-13.tar.bz2
 )
 themes_CDS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-cds-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-cds-13.tar.bz2
 )
 themes_CSS? (
-	ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-css-13.tar.bz2
+	ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-css-13.tar.bz2
 )"
 
 REQUIRED_USE="^^ ( themes_CLD themes_CLDX themes_CLS themes_CLDG themes_CSS
diff --git a/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-14.ebuild b/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-14.ebuild
index f08adf99a..5f2c13e84 100644
--- a/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-14.ebuild
+++ b/media-gfx/syslinux-themes-calculate/syslinux-themes-calculate-14.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/syslinux/syslinux-calculate-${PV}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/syslinux/syslinux-calculate-${PV}.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/syslinux/syslinux-calculate-${PV}.tar.bz2"
 
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
diff --git a/net-proxy/squidguard-digincore/squidguard-digincore-20111116.ebuild b/net-proxy/squidguard-digincore/squidguard-digincore-20111116.ebuild
index dd2279c08..eee2c75f1 100644
--- a/net-proxy/squidguard-digincore/squidguard-digincore-20111116.ebuild
+++ b/net-proxy/squidguard-digincore/squidguard-digincore-20111116.ebuild
@@ -8,8 +8,8 @@ inherit eutils
 
 DESCRIPTION="18+ blacklists for SquidGuard"
 HOMEPAGE="http://www.digincore.org/"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/squidguard-digincore/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/squidguard-digincore/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/squidguard-digincore/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/squidguard-digincore/${P}.tar.bz2"
 
 LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-3.0"
 SLOT="0"
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index 48a79c2f4..168375563 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -1,2 +1 @@
 DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
-DIST calculate-lib-2.2.32.tar.bz2 121878 SHA256 fe85e033eb16703e9fc6dcdc06fe12dd215c56315ceed7a6eee8c732229b1cd6 SHA512 933619746b5dd2a30cc4e98080ba3f40c8131c86852f55ecfefd8a239a6625985abb7fcc5e71d3b346d811e30ab997ad1d3c2142d1b1f46a3e6387c009b3eb6a WHIRLPOOL 5f678cee97dacd18e9ba4b10534808b8def8d9b3f476b6a397b8e8da4c7eb844722da62af2c53c4aa00d41c606a2b9f474a780ad257aec5ad8175002bfe97589
diff --git a/sys-apps/calculate-lib/calculate-lib-2.1.11-r5.ebuild b/sys-apps/calculate-lib/calculate-lib-2.1.11-r5.ebuild
index 1216825d7..24666c514 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.1.11-r5.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.1.11-r5.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python2_7)
 
 inherit distutils-r1 eutils
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="The library for Calculate 2"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
diff --git a/sys-apps/calculate-server/calculate-server-2.1.16-r21.ebuild b/sys-apps/calculate-server/calculate-server-2.1.16-r21.ebuild
index a52d0c043..ef0dfa4d3 100644
--- a/sys-apps/calculate-server/calculate-server-2.1.16-r21.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.16-r21.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python{2_6,2_7})
 
 inherit distutils-r1 eutils
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
diff --git a/sys-apps/calculate-server/calculate-server-2.1.16-r22.ebuild b/sys-apps/calculate-server/calculate-server-2.1.16-r22.ebuild
index d589b4499..44f0ed012 100644
--- a/sys-apps/calculate-server/calculate-server-2.1.16-r22.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.16-r22.ebuild
@@ -7,8 +7,8 @@ PYTHON_COMPAT=(python{2_6,2_7})
 
 inherit distutils-r1 eutils
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/calculate2/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Configuration utility for Linux services"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.7.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.7.ebuild
index d5aef4baf..e5d17241d 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.7.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.7.ebuild
@@ -5,9 +5,9 @@
 EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_toolkit"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.calculate-linux.org"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+    http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.8.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.8.ebuild
index 8199e37e6..2c7ff78b8 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.8.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.8.ebuild
@@ -5,9 +5,10 @@
 EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_toolkit"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.calculate-linux.org"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+    http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.9.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.9.ebuild
index 8199e37e6..2480e1562 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.1.9.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.1.9.ebuild
@@ -5,9 +5,9 @@
 EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_toolkit"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.calculate-linux.org"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/keyexec/keyexec-0.1.2-r4.ebuild b/sys-apps/keyexec/keyexec-0.1.2-r4.ebuild
index 8ed632cae..f55c59768 100644
--- a/sys-apps/keyexec/keyexec-0.1.2-r4.ebuild
+++ b/sys-apps/keyexec/keyexec-0.1.2-r4.ebuild
@@ -4,9 +4,8 @@
 
 DESCRIPTION="Runs other programs with the user password, kept in the Linux kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/keyexec"
-SRC_URI="ftp://ftp.calculate-linux.org/pub/calculate/${PN}/${P}.tar.bz2
-		http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2
-		ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+		http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 
diff --git a/sys-auth/pam_client/pam_client-0.2.1.ebuild b/sys-auth/pam_client/pam_client-0.2.1.ebuild
index 7f9044715..94e72af83 100644
--- a/sys-auth/pam_client/pam_client-0.2.1.ebuild
+++ b/sys-auth/pam_client/pam_client-0.2.1.ebuild
@@ -4,8 +4,8 @@
 
 DESCRIPTION="Module of the waiting client daemon"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild b/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild
index 32065181e..b85151e2b 100644
--- a/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild
+++ b/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild
@@ -4,8 +4,8 @@
 
 DESCRIPTION="Keeps a login and the password the user in the kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/pam_keystore"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_update/pam_update-0.1.0.ebuild b/sys-auth/pam_update/pam_update-0.1.0.ebuild
index b603e7c42..289ff33ee 100644
--- a/sys-auth/pam_update/pam_update-0.1.0.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.0.ebuild
@@ -4,8 +4,8 @@
 
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_update/pam_update-0.1.1.ebuild b/sys-auth/pam_update/pam_update-0.1.1.ebuild
index b603e7c42..289ff33ee 100644
--- a/sys-auth/pam_update/pam_update-0.1.1.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.1.ebuild
@@ -4,8 +4,8 @@
 
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_update/pam_update-0.1.2.ebuild b/sys-auth/pam_update/pam_update-0.1.2.ebuild
index b603e7c42..289ff33ee 100644
--- a/sys-auth/pam_update/pam_update-0.1.2.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.2.ebuild
@@ -4,8 +4,8 @@
 
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-boot/calcboot/calcboot-3.86.6.ebuild b/sys-boot/calcboot/calcboot-3.86.6.ebuild
index 9997afeec..13c2d73c1 100644
--- a/sys-boot/calcboot/calcboot-3.86.6.ebuild
+++ b/sys-boot/calcboot/calcboot-3.86.6.ebuild
@@ -14,7 +14,7 @@ SYSLINUX_PF=${SYSLINUX_P}
 DESCRIPTION="Module calcmenu.c32 for syslinux"
 HOMEPAGE="http://www.calculate-linux.org/main/ru/calcboot"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SYSLINUX_P}.tar.bz2
-		ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2"
+		ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/calcboot/calcboot-4.07.0.ebuild b/sys-boot/calcboot/calcboot-4.07.0.ebuild
index 483656c7d..0b6d8a58b 100644
--- a/sys-boot/calcboot/calcboot-4.07.0.ebuild
+++ b/sys-boot/calcboot/calcboot-4.07.0.ebuild
@@ -13,7 +13,7 @@ SYSLINUX_P=${SYSLINUX_PN}-${SYSLINUX_PV}
 DESCRIPTION="Module calcmenu.c32 for syslinux"
 HOMEPAGE="http://www.calculate-linux.org/main/ru/calcboot"
 SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${SYSLINUX_PV:0:1}.xx/${SYSLINUX_P/_/-}.tar.bz2
-		ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2"
+		ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/www-plugins/chrome-ublock/chrome-ublock-0.9.8.2.ebuild b/www-plugins/chrome-ublock/chrome-ublock-0.9.8.2.ebuild
index 19ef794c9..dd1075baa 100644
--- a/www-plugins/chrome-ublock/chrome-ublock-0.9.8.2.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-0.9.8.2.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit eutils
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
 	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="An efficient blocker for Chromium"
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r5.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r5.ebuild
index 9222d963a..9ec2bb5c2 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r5.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/icon/icon-calculate-15-r4.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/icon/icon-calculate-15-r4.tar.bz2
 	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r4.tar.bz2"
 
 REQUIRED_USE=""
diff --git a/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild b/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
index def6cf6bb..9f9709ff5 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
@@ -4,8 +4,8 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild b/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
index def6cf6bb..9f9709ff5 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
@@ -4,8 +4,8 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
 
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
index 8da2e873e..2a2e3dcfc 100644
--- a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
+++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
@@ -8,7 +8,7 @@ inherit gnome2-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
-SRC_URI="ftp://ftp.calculate.ru/pub/calculate/themes/elementary/${PF}.tar.bz2
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/themes/elementary/${PF}.tar.bz2
 		http://mirror.yandex.ru/calculate/themes/elementary/${PF}.tar.bz2"
 
 RESTRICT="binchecks strip"