diff --git a/app-crypt/shim-signed/shim-signed-0.2.ebuild b/app-crypt/shim-signed/shim-signed-0.2.ebuild
index 9a7e62efa..9c1381207 100644
--- a/app-crypt/shim-signed/shim-signed-0.2.ebuild
+++ b/app-crypt/shim-signed/shim-signed-0.2.ebuild
@@ -7,8 +7,7 @@ EAPI=7
 DESCRIPTION="UEFI Shim bootloader for SecureBoot signed by Microsoft"
 HOMEPAGE="http://mjg59.dreamwidth.org/20303.html"
 SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/${P}.tgz"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tgz
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tgz"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tgz"
 
 LICENSE="as-is"
 SLOT="0"
diff --git a/eclass/calculate-utils-r15.eclass b/eclass/calculate-utils-r15.eclass
index 0f1285142..f52a91f53 100644
--- a/eclass/calculate-utils-r15.eclass
+++ b/eclass/calculate-utils-r15.eclass
@@ -18,7 +18,7 @@ inherit distutils-r1 eutils
 EXPORTED_FUNCTIONS="src_compile src_install pkg_preinst"
 
 CALCULATE_URI="https://mirror.calculate-linux.org/source/calculate3"
-MIRROR_URI="https://mirror.yandex.ru/calculate/source/calculate3"
+MIRROR_URI=
 
 # @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 a10385725..65ebf12e8 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
@@ -15,18 +15,14 @@ IUSE="+CL11 +CL12 +CL13"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/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 2dae93e5f..c62487ffc 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
@@ -15,20 +15,15 @@ IUSE="+CL11 +CL12 +CL13 +CL14"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/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-17-r4.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
index 11b774e2c..87df1fadf 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
@@ -15,26 +15,20 @@ IUSE="+CL11 +CL12 +CL13 +CL14 +CL15"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17.jpg -> ${PF}.jpg
 	CL15? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	)
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
 
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
index 3b913d320..eec06f084 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
@@ -15,30 +15,23 @@ IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/calculate/wallpaper-18.jpg -> ${PF}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-18.jpg -> ${PF}.jpg
 	CL17? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-17.tar.bz2
 	)
 	CL15? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	)
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
 
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-21.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-21.ebuild
index 6f7c1769c..1ee495b20 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-21.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-21.ebuild
@@ -15,30 +15,23 @@ IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/calculate/wallpaper-21.jpg -> ${PF}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-21.jpg -> ${PF}.jpg
 	CL17? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-17.tar.bz2
 	)
 	CL15? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	)
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	"
 
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild
index 1c450a634..e395c51a5 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-22.ebuild
@@ -15,34 +15,26 @@ IUSE="+CL11 +CL12 +CL13 +CL14 +CL15 +CL17 +CL21"
 
 SRC_URI="
 	https://mirror.calculate-linux.org/themes/calculate/wallpaper-22.jpg -> ${PF}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/wallpaper-22.jpg -> ${PF}.jpg
 	CL21? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-21.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-21.tar.bz2
 	)
 	CL17? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-17.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-17.tar.bz2
 	)
 	CL15? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
 	)
 	CL14? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
 	)
 	CL13? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
 	)
 	CL12? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
 	)
 	CL11? (
 		https://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
-		https://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
 	)
 	"
 
diff --git a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
index 51b92bc25..a7139816c 100644
--- a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
+++ b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/cinnamon/cinnamon-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
 
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 f8476e739..c1e6fb3dd 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,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-14-r4.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/dm/dm-14-r4.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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 cc8fc65fa..21a5c006d 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-15.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/dm/dm-15.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/dm/dm-15.tar.bz2"
 
 RDEPEND=""
 
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
index 5f80efdb6..f90c2de35 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
@@ -14,10 +14,12 @@ IUSE="+splash +login"
 
 REQUIRED_USE="|| ( splash login )"
 
-SRC_URI="login? ( https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg )
-	splash? ( https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
+SRC_URI="login? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	)
+	splash? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
+	)"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
index 5f80efdb6..f90c2de35 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
@@ -14,10 +14,12 @@ IUSE="+splash +login"
 
 REQUIRED_USE="|| ( splash login )"
 
-SRC_URI="login? ( https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg )
-	splash? ( https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
+SRC_URI="login? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	)
+	splash? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
+	)"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-21.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-21.ebuild
index 5f80efdb6..f90c2de35 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-21.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-21.ebuild
@@ -14,10 +14,12 @@ IUSE="+splash +login"
 
 REQUIRED_USE="|| ( splash login )"
 
-SRC_URI="login? ( https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg )
-	splash? ( https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
-	https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg )"
+SRC_URI="login? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
+	)
+	splash? (
+		https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
+	)"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild
index 023a29b06..66417d7ab 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-22.ebuild
@@ -17,11 +17,9 @@ REQUIRED_USE="|| ( splash login )"
 SRC_URI="
 	login? (
 		https://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
-		https://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}.jpg -> ${PN}-login-${PVR}.jpg
 	)
 	splash? (
 		https://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
-		https://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PVR}.jpg
 	)
 "
 
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 f4ceb3b2a..bfe5508f0 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,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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 f4ceb3b2a..bfe5508f0 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,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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 e9cf49ac9..3fb4b28f7 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
 
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
index 52ff76060..974e3771e 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
index e9cf49ac9..3fb4b28f7 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/gfxboot"
 
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
index 52ff76060..974e3771e 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PV}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-20.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r2.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
index f41c90963..3926b16e1 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r3.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	https://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r4.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r4.ebuild
index b9259b4a9..b48563a32 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r4.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r4.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	https://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r5.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r5.ebuild
index b9259b4a9..b48563a32 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r5.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21-r5.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	https://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
index 4176b6fed..b2c15579f 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-21.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/gfxboot/gfxboot-themes-calculate-${PVR}.tar.bz2"
 
 DEPEND="media-gfx/gfxboot
 	!<sys-apps/calculate-utils-3.5.2.6"
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 c0f7b95b9..8cd185817 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-14-r1.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/grub/grub-14-r1.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-14-r1.tar.bz2"
+
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
 DEPEND="${RDEPEND}"
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 a979be3b5..f8bd99a5c 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/grub/grub-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/grub/grub-${PV}.tar.bz2"
+
 RDEPEND="!<sys-boot/calcboot-4.05.0-r1"
 
 DEPEND="${RDEPEND}"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
index bcc716107..64775d5d7 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-17-r1.jpg -> ${P}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/grub-17-r1.jpg -> ${P}.jpg"
+SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-17-r1.jpg -> ${P}.jpg"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
index dee393773..4931248fb 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg
-	http://mirror.yandex.ru/calculate/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg"
+SRC_URI="https://mirror.calculate-linux.org/themes/calculate/grub-18-r1.jpg -> ${PF}.jpg"
 
 DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
 
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 1e43aef44..76f3972a1 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,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
 	x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
index 1e43aef44..76f3972a1 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
 	x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
index fbaf2e33f..5702e8434 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND=">=media-gfx/dm-themes-calculate-${PV}
 	x11-themes/gtk-engines-murrine
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 485ad0169..54b3d2bd2 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PV}.tar.bz2"
 
 RDEPEND="~media-gfx/dm-themes-calculate-${PV}
 	x11-themes/gtk-engines-murrine
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
index e1b1e8e38..7f39bbb29 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
 	x11-misc/lightdm-gtk-greeter"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
index e1b1e8e38..7f39bbb29 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
 	x11-misc/lightdm-gtk-greeter"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
index e1b1e8e38..7f39bbb29 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lightdm/lightdm-calculate-${PVR}.tar.bz2"
 
 RDEPEND="x11-themes/gtk-engines-murrine
 	x11-misc/lightdm-gtk-greeter"
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 90c6e28e3..978360d71 100644
--- a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
+++ b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lxdm/lxdm-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lxdm/lxdm-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lxdm/lxdm-calculate-${PV}.tar.bz2"
 
 REQUIRED_USE=""
 
diff --git a/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild b/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
index 7d71dd421..63cf9e3c4 100644
--- a/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
+++ b/media-gfx/lxqt-themes-calculate/lxqt-themes-calculate-18-r7.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/lxqt/${PF}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/lxqt/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/lxqt/${PF}.tar.bz2"
 
 src_install() {
 	insinto /
diff --git a/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild b/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
index 6b21fea32..b505699e6 100644
--- a/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
+++ b/media-gfx/mate-themes-calculate/mate-themes-calculate-17.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/mate/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/mate/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/mate/${P}.tar.bz2"
 
 src_install() {
 	insinto /
diff --git a/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild b/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
index 3d485406b..89e52566b 100644
--- a/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
+++ b/media-gfx/mate-themes-calculate/mate-themes-calculate-18-r6.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/mate/${PF}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/mate/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/mate/${PF}.tar.bz2"
 
 src_install() {
 	insinto /
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 e10512222..ab902c7b4 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-15.ebuild
@@ -12,9 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2"
-
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
 RDEPEND="media-gfx/dm-themes-calculate"
 
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
index 5c5c5b406..d24924ef2 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17-r1.ebuild
@@ -12,9 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PVR}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PVR}.tar.bz2"
-
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PVR}.tar.bz2"
 
 src_install() {
 	insinto /
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
index b195b2f43..0178c386e 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/plasma/plasma-calculate-${PV}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
 
 src_install() {
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
index 196de3dfd..536582097 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-17-r3.ebuild
@@ -16,13 +16,11 @@ REQUIRED_USE="|| ( verbose silent silent-shutdown )"
 
 SRC_URI="silent? ( 
 		https://mirror.calculate-linux.org/themes/calculate/splash-silent-17.jpg -> ${PN}-silent-17.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-17.jpg -> ${PN}-silent-17.jpg )
 	verbose? (
 		https://mirror.calculate-linux.org/themes/calculate/splash-verbose-17-r1.jpg -> ${PN}-verbose-17-r1.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-verbose-17-r1.jpg -> ${PN}-verbose-17-r1.jpg )
 	silent-shutdown? (
 		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-17.jpg -> ${PN}-shutdown-17.jpg )"
+	)"
 
 DEPEND="media-gfx/splashutils
 	media-fonts/droid
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
index 00ba22b00..bbf0258c8 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-18-r3.ebuild
@@ -16,13 +16,11 @@ REQUIRED_USE="|| ( verbose silent silent-shutdown )"
 
 SRC_URI="silent? ( 
 		https://mirror.calculate-linux.org/themes/calculate/splash-silent-18.jpg -> ${PN}-silent-18.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-18.jpg -> ${PN}-silent-18.jpg )
 	verbose? (
 		https://mirror.calculate-linux.org/themes/calculate/splash-verbose-18.jpg -> ${PN}-verbose-18.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-verbose-18.jpg -> ${PN}-verbose-18.jpg )
 	silent-shutdown? (
 		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-18-r1.jpg -> ${PN}-shutdown-18-r1.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-18-r1.jpg -> ${PN}-shutdown-18-r1.jpg )"
+	)"
 
 DEPEND="media-gfx/splashutils
 	media-fonts/droid
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
index f441550b1..2626baccd 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-19-r1.ebuild
@@ -16,10 +16,10 @@ REQUIRED_USE="|| ( silent silent-shutdown )"
 
 SRC_URI="silent? ( 
 		https://mirror.calculate-linux.org/themes/calculate/splash-silent-${PV}.png -> ${PN}-silent-${PV}.png
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-silent-${PV}.png -> ${PN}-silent-${PV}.png )
+	)
 	silent-shutdown? (
 		https://mirror.calculate-linux.org/themes/calculate/splash-shutdown-${PV}.jpg -> ${PN}-shutdown-${PV}.jpg
-		http://mirror.yandex.ru/calculate/themes/calculate/splash-shutdown-${PV}.jpg -> ${PN}-shutdown-${PV}.jpg )"
+	)"
 
 DEPEND="sys-boot/plymouth-calculate-plugin
 	sys-boot/plymouth-openrc-plugin
diff --git a/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild b/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
index 159fefa64..bd3f81559 100644
--- a/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
+++ b/media-gfx/xfce-themes-calculate/xfce-themes-calculate-18.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SRC_URI="https://mirror.calculate-linux.org/themes/xfce/${PF}.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/xfce/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/xfce/${PF}.tar.bz2"
 
 src_install() {
 	insinto /
diff --git a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
index c917803b7..26a54f799 100644
--- a/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
+++ b/sys-apps/calculate-access/calculate-access-0.1.2.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Cryptodata management tools"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_access"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-server/calculate-server-2.3.8.ebuild b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild
index 6ea7c99fa..554a106cd 100644
--- a/sys-apps/calculate-server/calculate-server-2.3.8.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.3.8.ebuild
@@ -7,8 +7,7 @@ PYTHON_COMPAT=(python3_9)
 
 inherit distutils-r1
 
-SRC_URI="https://mirror.calculate-linux.org/source/calculate2/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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.2.1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
index 945588524..04c948430 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.1.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
index 945588524..04c948430 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.2.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
index 945588524..04c948430 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.3.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
index b8c0db246..aa2480397 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.5.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
index 3629ecc29..d41ee430d 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.6.ebuild
@@ -6,8 +6,7 @@ EAPI="5"
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
index 11212e6b9..9a509a061 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7-r1.ebuild
@@ -5,8 +5,8 @@
 EAPI="7"
 PYTHON_COMPAT=(python3_9)
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${PF}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${PF}.tar.bz2"
+
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
 
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
index a88658762..90a6d44a9 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.2.7.ebuild
@@ -5,8 +5,8 @@
 EAPI="7"
 PYTHON_COMPAT=(python3_9)
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
+
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org"
 
diff --git a/sys-apps/keyexec/keyexec-0.1.3.ebuild b/sys-apps/keyexec/keyexec-0.1.3.ebuild
index edd7d423e..f51495f44 100644
--- a/sys-apps/keyexec/keyexec-0.1.3.ebuild
+++ b/sys-apps/keyexec/keyexec-0.1.3.ebuild
@@ -5,8 +5,7 @@
 EAPI=7
 DESCRIPTION="Runs other programs with the user password, kept in the Linux kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/keyexec"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-		http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 
diff --git a/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
index e210f3aa1..3349f2833 100644
--- a/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
+++ b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
@@ -7,8 +7,7 @@ inherit pam
 
 DESCRIPTION="Module of the waiting client daemon"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
index 1b8f3b508..294be7938 100644
--- a/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
+++ b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
@@ -7,8 +7,7 @@ inherit pam
 
 DESCRIPTION="Keeps a login and the password the user in the kernel"
 HOMEPAGE="http://www.calculate-linux.org/main/en/pam_keystore"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
index 2080c48c8..e0b7a04d3 100644
--- a/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
@@ -7,8 +7,7 @@ inherit pam
 
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild b/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
index 1c36c766c..343ebd424 100644
--- a/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
+++ b/sys-firmware/lnvnb161216-firmware/lnvnb161216-firmware-20210607.ebuild
@@ -8,8 +8,8 @@ MYP=linux-firmware-${PV}
 
 KEYWORDS="amd64 x86"
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
+
 DESCRIPTION="Binary firmware for Lenovo Yoga 7 (LNVNB161216) S3 mode"
 HOMEPAGE="https://gist.github.com/zurohki/4b859668c901e6ba13e8187a0d5d734c"
 
diff --git a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
index d90fd885a..8e9332d9c 100644
--- a/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
+++ b/www-plugins/chrome-freedommarks/chrome-freedommarks-0.1.2.ebuild
@@ -6,8 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Browser extension for Nextcloud Bookmarks"
 HOMEPAGE="https://chrome.google.com/webstore/detail/gmmpjoepfelkmeedfkfkadgkhholibko"
diff --git a/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild b/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
index 235634f5b..6f020114f 100644
--- a/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
+++ b/www-plugins/chrome-passman/chrome-passman-2.1.2.ebuild
@@ -6,8 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="Passman - The password manager for NextCloud / ownCloud"
 HOMEPAGE="https://chrome.google.com/webstore/detail/hlpjhlifkgmoibhollggngbbhbejecph"
diff --git a/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild b/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
index 6fa92d409..a8d8814b4 100644
--- a/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-1.24.4.ebuild
@@ -6,8 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="An efficient blocker for Chromium"
 HOMEPAGE="https://chrome.google.com/webstore/detail/cjpalhdlnbpafiamejdnhcphjbkeiagm"
diff --git a/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild b/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
index 6fa92d409..a8d8814b4 100644
--- a/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
+++ b/www-plugins/chrome-ublock/chrome-ublock-1.27.10.ebuild
@@ -6,8 +6,7 @@ EAPI="7"
 
 inherit eutils
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2"
 
 DESCRIPTION="An efficient blocker for Chromium"
 HOMEPAGE="https://chrome.google.com/webstore/detail/cjpalhdlnbpafiamejdnhcphjbkeiagm"
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
index 45604ef46..3c49b1814 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r7.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r4.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r4.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r4.tar.bz2"
 
 REQUIRED_USE=""
 
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
index 8ca834afc..eef7f6108 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r8.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r6.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2"
 
 REQUIRED_USE=""
 
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
index 2d0d0ed19..00488401f 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-15-r9.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-15-r6.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-15-r6.tar.bz2"
 
 REQUIRED_USE=""
 
diff --git a/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild b/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
index 941472cf0..49020e84d 100644
--- a/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
+++ b/x11-themes/calculate-icon-theme/calculate-icon-theme-19.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+qt5"
 
-SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-19.tar.bz2
-	http://mirror.yandex.ru/calculate/themes/icon/icon-calculate-19.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/icon/icon-calculate-19.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 985982a9a..aae14ee3f 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-13-r1.ebuild
@@ -4,8 +4,7 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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 985982a9a..aae14ee3f 100644
--- a/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
+++ b/x11-themes/calculate-xcursors/calculate-xcursors-14-r1.ebuild
@@ -4,8 +4,7 @@
 DESCRIPTION="Calculate X.Org mouse cursor"
 HOMEPAGE="http://www.calculate-linux.org/packages/x11-themes/calculate-xcursors"
 
-SRC_URI="https://mirror.calculate-linux.org/source/${PN}/${P}.tar.bz2
-	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/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 35c9b4119..a022d3dd4 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,8 +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="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/elementary/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2"
 
 RESTRICT="binchecks strip"
 
diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
index 71c71c683..bfa0f24e5 100644
--- a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
+++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r5.ebuild
@@ -7,8 +7,7 @@ inherit gnome2-utils
 
 DESCRIPTION="Elementary icon theme is designed to be smooth, sexy, clear, and efficient"
 HOMEPAGE="https://launchpad.net/elementaryicons"
-SRC_URI="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2
-		http://mirror.yandex.ru/calculate/themes/elementary/${PF}.tar.bz2"
+SRC_URI="https://mirror.calculate-linux.org/themes/elementary/${PF}.tar.bz2"
 
 RESTRICT="binchecks strip"