commit:     ec011d89113bd8d89b3e74e689f8ead187d28530
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 12 11:48:15 2018 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Jun 12 11:48:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec011d89

app-crypt/keybase: Add warning to remove obsolete user

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/keybase/keybase-1.0.48.ebuild | 9 +--------
 app-crypt/keybase/keybase-2.0.0.ebuild  | 9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app-crypt/keybase/keybase-1.0.48.ebuild 
b/app-crypt/keybase/keybase-1.0.48.ebuild
index 4f5335a3e2a..af077ef41e5 100644
--- a/app-crypt/keybase/keybase-1.0.48.ebuild
+++ b/app-crypt/keybase/keybase-1.0.48.ebuild
@@ -19,14 +19,6 @@ DEPEND="
 RDEPEND="
        app-crypt/gnupg"
 
-src_prepare() {
-       # if grep --quiet keybasehelper /etc/passwd; then
-       #       ewarn "Removing obsolete user keybasehelper"
-       #       userdel --remove keybasehelper || die
-       # fi
-       eapply_user
-}
-
 src_unpack() {
        unpack "${P}.tar.gz"
        ln -vs "client-${PV}" "${P}" || die
@@ -58,4 +50,5 @@ pkg_postinst() {
        elog "Start/Restart keybase: run_keybase"
        elog "Run the service:       keybase service"
        elog "Run the client:        keybase login"
+       ewarn "Note that the user keybasehelper is obsolete and can be removed"
 }

diff --git a/app-crypt/keybase/keybase-2.0.0.ebuild 
b/app-crypt/keybase/keybase-2.0.0.ebuild
index 4f5335a3e2a..af077ef41e5 100644
--- a/app-crypt/keybase/keybase-2.0.0.ebuild
+++ b/app-crypt/keybase/keybase-2.0.0.ebuild
@@ -19,14 +19,6 @@ DEPEND="
 RDEPEND="
        app-crypt/gnupg"
 
-src_prepare() {
-       # if grep --quiet keybasehelper /etc/passwd; then
-       #       ewarn "Removing obsolete user keybasehelper"
-       #       userdel --remove keybasehelper || die
-       # fi
-       eapply_user
-}
-
 src_unpack() {
        unpack "${P}.tar.gz"
        ln -vs "client-${PV}" "${P}" || die
@@ -58,4 +50,5 @@ pkg_postinst() {
        elog "Start/Restart keybase: run_keybase"
        elog "Run the service:       keybase service"
        elog "Run the client:        keybase login"
+       ewarn "Note that the user keybasehelper is obsolete and can be removed"
 }

Reply via email to