diff --git a/sys-apps/calculate-access/Manifest b/sys-apps/calculate-access/Manifest
index eb4de0aef..e266c114e 100644
--- a/sys-apps/calculate-access/Manifest
+++ b/sys-apps/calculate-access/Manifest
@@ -1 +1 @@
-DIST calculate-access-0.1.2.tar.bz2 8748 SHA256 7ee31678b99fe7ee2b68e7e675dc1e71ac53a6b5c2001068669b774db2da22e6 SHA512 bece578faba65e54e7b692b6a5d7b2921cc29eeef7003c596ea9d9d0dad7642deec594a1edff4f8121dbe48687460448bba06bbcab94646d12a9ad236b00eb2f WHIRLPOOL d14c042553a0a96d865f743c14fa2c3e5ca0e198c60f61b7575f783a78d712068e6e6239e00ad2b33aa0275116f8de8b427c0409277ab6ccb8e31ef4099f86ab
+DIST calculate-access-0.1.2.tar.bz2 8748 BLAKE2B 78a52cb60aa3651d50fe9061b4266e37b2ce11159d23e2ae7136572a208162ff1aa1bf61a5770002dca0945e8023425789f13d7bf39508eddbf0f7be98a809a7 SHA512 bece578faba65e54e7b692b6a5d7b2921cc29eeef7003c596ea9d9d0dad7642deec594a1edff4f8121dbe48687460448bba06bbcab94646d12a9ad236b00eb2f
diff --git a/sys-apps/calculate-access/calculate-access-9999.ebuild b/sys-apps/calculate-access/calculate-access-9999.ebuild
index 88a36e920..3fbade007 100644
--- a/sys-apps/calculate-access/calculate-access-9999.ebuild
+++ b/sys-apps/calculate-access/calculate-access-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Cryptodata management tools"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_access"
@@ -22,7 +22,7 @@ src_install() {
 	then
 		DESTDIR=$D emake install_client
 	fi
-	
+
 	if use server
 	then
 		DESTDIR=$D emake install_server
diff --git a/sys-apps/calculate-lib/Manifest b/sys-apps/calculate-lib/Manifest
index 330da726c..9e164c8f1 100644
--- a/sys-apps/calculate-lib/Manifest
+++ b/sys-apps/calculate-lib/Manifest
@@ -1,2 +1,2 @@
-DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
-DIST calculate-lib-2.1.12.tar.bz2 62375 SHA256 43d74a948e0881fc65cb268e58499d3b4a8c7e5507a0d50ceeebdd3c25aed801 SHA512 a7c53d8333f8ee11b0536fbe8f7284e3b19a226b67034e84831fbb47b9d4df5f1da9631c0f15ad8ccadfca4aa6d6d5c7ed35dde6ab0e6a77618a15d1f04fbe40 WHIRLPOOL aff11ed2c9785640cbeae7213e7f90ce55721e3bc828aff872c1b6ca652c9ae706d81dbd6f071b2cbfa0b3a3376cf0fe7d20c9ad3db7f2607b277bced07a76da
+DIST calculate-lib-2.1.11.tar.bz2 61687 BLAKE2B 9f34313ec6fe83b41a2d6be318d4f0c6ae0ea3102f905656bcea6decf09e60a020168232ed7cae90bc092959284b8f68bff57fcd27bd7e3576b620ae0a4fd870 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67
+DIST calculate-lib-2.1.12.tar.bz2 62375 BLAKE2B f4b962072286a61e3222db5ef8bf31dbe2cd12029edd89495dab1a15dea9e64cddbb4fc77776f6d0288cc01023d1a2b8d87e2c55ec5ff75cf99d65d878fe15f1 SHA512 a7c53d8333f8ee11b0536fbe8f7284e3b19a226b67034e84831fbb47b9d4df5f1da9631c0f15ad8ccadfca4aa6d6d5c7ed35dde6ab0e6a77618a15d1f04fbe40
diff --git a/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild b/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
index ba7647f4e..abe21f729 100644
--- a/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
+++ b/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=(python2_7)
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 EGIT_REPO_URI="git://git.calculate-linux.org/calculate-2.1/calculate-lib.git"
 
diff --git a/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild b/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
index ebbe73d70..50bf21669 100644
--- a/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=(python2_7)
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 EGIT_REPO_URI="git://git.calculate-linux.org/calculate-2.1/calculate-server.git"
 
diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
index 6ff91bae4..348591555 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Collection of administration scripts for Calculate"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_toolkit"
diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
index 9f8ac85b3..e337a03ca 100644
--- a/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
+++ b/sys-apps/calculate-utils/calculate-utils-3.6.9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=(python2_7)
 
-inherit calculate-utils-r6 git-2
+inherit calculate-utils-r6 git-r3
 
 DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
@@ -21,6 +21,6 @@ src_unpack() {
 	do
 		MODULE_DATA=( $MODULE )
 		MODULE_PN=${MODULE_DATA[0]}
-		EGIT_SOURCEDIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate-linux.org/calculate-3/${MODULE_PN}.git git-2_src_unpack
+		EGIT_CHECKOUT_DIR=${WORKDIR}/${MODULE_PN}-${PV} EGIT_REPO_URI=git://git.calculate-linux.org/calculate-3/${MODULE_PN}.git git-r3_src_unpack
 	done
 }