diff --git a/sys-auth/pam_client/Manifest b/sys-auth/pam_client/Manifest
index 13645cbce..c65c13a97 100644
--- a/sys-auth/pam_client/Manifest
+++ b/sys-auth/pam_client/Manifest
@@ -1 +1 @@
-DIST pam_client-0.2.1.tar.bz2 6897 SHA256 e1fc32033489456451cf4cb862ce07c15415c75bcb28846f72bb6be72ea5f4f1 SHA512 86d5e2f5140b1543c7baaff471736af443a46644feb28e99a86acb650c8aa212e584c780b3be02a7a087e54cd5edf117ebb1d2eb6ba8a2d936ad00cedba56d4d WHIRLPOOL 12a52fc3b256e480c29986a570ae618c25e0cce2938edcdf36ed3ff7bf0aa8516a39fb3a411007ddb2437b228a1b3a119596f9b719a7295d4852a3b54cd5ffe3
+DIST pam_client-0.2.1.tar.bz2 6897 BLAKE2B 04f09803bad9809184111c087ee6fff70aff60d62e7fe4ccd66af6434e5383b2e6cd42327fceb8976c8b77e2a751cb7ac59cd9729d524fdde67876cece874314 SHA512 86d5e2f5140b1543c7baaff471736af443a46644feb28e99a86acb650c8aa212e584c780b3be02a7a087e54cd5edf117ebb1d2eb6ba8a2d936ad00cedba56d4d
diff --git a/sys-auth/pam_client/pam_client-0.2.1.ebuild b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
similarity index 93%
rename from sys-auth/pam_client/pam_client-0.2.1.ebuild
rename to sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
index 94e72af83..ae790cef6 100644
--- a/sys-auth/pam_client/pam_client-0.2.1.ebuild
+++ b/sys-auth/pam_client/pam_client-0.2.1-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit pam
+
 DESCRIPTION="Module of the waiting client daemon"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
@@ -19,5 +21,5 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	dopammod pam_client.so
 }
diff --git a/sys-auth/pam_keystore/Manifest b/sys-auth/pam_keystore/Manifest
index b6d3dba20..b50031892 100644
--- a/sys-auth/pam_keystore/Manifest
+++ b/sys-auth/pam_keystore/Manifest
@@ -1 +1 @@
-DIST pam_keystore-0.1.3.tar.bz2 5894 SHA256 edc8bafd89cc8e5a18b23ce521beaba250fcfd4a53d8c2bdab4d17b77058f493
+DIST pam_keystore-0.1.3.tar.bz2 5894 BLAKE2B 44fd0912846b2412dc4392bc5b666c5d295d1fdd8325655281427505c0ab193d4a0bb4da3e7f6a82c43ded00caf130140fcc4ff26e08a213f295ac011367aa42 SHA512 5336bccab706921b13146592d634489bd6d6b7f0fdc17fa3f2dccb163d886792bc873aa09009c65bd15b44e9f7dd8a7ee0d67480da80d7b3f73400bf33834444
diff --git a/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
similarity index 93%
rename from sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild
rename to sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
index b85151e2b..04996c4f2 100644
--- a/sys-auth/pam_keystore/pam_keystore-0.1.3.ebuild
+++ b/sys-auth/pam_keystore/pam_keystore-0.1.3-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+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="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
@@ -19,5 +21,5 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	dopammod pam_keystore.so
 }
diff --git a/sys-auth/pam_update/Manifest b/sys-auth/pam_update/Manifest
index 02c39f6b2..fad0b9487 100644
--- a/sys-auth/pam_update/Manifest
+++ b/sys-auth/pam_update/Manifest
@@ -1,2 +1 @@
-DIST pam_update-0.1.2.tar.bz2 6073 SHA256 91d22b02104159d9d73a2251c65a32d49f18ee84abe2dd28c594b6c8d592a5dc SHA512 f7155c2ab32795c02c36f1a0ce6564e681beeecceae17a1829da0c3857bf563bb7ced535d16e5ace1935db932a90d5c62e21854fed3194e3786b7679ed861a14 WHIRLPOOL f559c6fcadb5838521b72e44ecc1540e5bd609044dfc7d7974f437d59681c1b68a6023c83d30cdb2869ed20e873be1039e28ee6cecc31587a4d7ed4065c2b1c6
-DIST pam_update-0.1.3.tar.bz2 5636 SHA256 15b8e0ffdf39cc743a65dcd871eacaf4382117a2763ccd149c5ebdbe2574b57e SHA512 5edc40b40cea09da5911155fa2fc2b2639abd7b596583fd38fb844f606a4b75ca204c51952dc5d55b6e9f2abfcedcc57458f9a277488af29997767e747a25111 WHIRLPOOL b594dcb1fdd35675609522b0cb19fba5216a50f7d859ab3a99dfff5d99c0d78190d69892847b6cf57fcfd9bbcee21baa325d66e78573c272937e6d39181e9714
+DIST pam_update-0.1.3.tar.bz2 5636 BLAKE2B cca0907cf5dfc9265f121a61788c3f523c4804a1ca07890a8cbd8db496ddcc2a8aacffbe1a49ed91d938211cdb5d69ef2ac151e527adb1af4a4a6711e7a1a64d SHA512 5edc40b40cea09da5911155fa2fc2b2639abd7b596583fd38fb844f606a4b75ca204c51952dc5d55b6e9f2abfcedcc57458f9a277488af29997767e747a25111
diff --git a/sys-auth/pam_update/pam_update-0.1.2.ebuild b/sys-auth/pam_update/pam_update-0.1.2.ebuild
deleted file mode 100644
index 91501d6fe..000000000
--- a/sys-auth/pam_update/pam_update-0.1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="System authentification update checkup tool"
-HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
-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"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="dev-libs/iniparser"
-RDEPEND="${DEPEND} !>=sys-apps/calculate-utils-3.5.0_alpha38"
-
-src_compile() {
-	make CFLAGS="-Wall ${CFLAGS}" || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-}
diff --git a/sys-auth/pam_update/pam_update-0.1.3.ebuild b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
similarity index 94%
rename from sys-auth/pam_update/pam_update-0.1.3.ebuild
rename to sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
index 660900c5a..5579805c5 100644
--- a/sys-auth/pam_update/pam_update-0.1.3.ebuild
+++ b/sys-auth/pam_update/pam_update-0.1.3-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit pam
+
 DESCRIPTION="System authentification update checkup tool"
 HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
 SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tar.bz2
@@ -19,5 +21,5 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	dopammod pam_update.so
 }