[gentoo-commits] repo/gentoo:master commit in: app-admin/pass/

["Jason Donenfeld" <zx2c4@gentoo.org>]

commit:     6a9a3e48cefc5a947f6e1e714d01e56ec39972ca
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 10:20:14 2017 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 10:20:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9a3e48

app-admin/pass: stable

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-admin/pass/Manifest          |  1 -
 app-admin/pass/pass-1.6.5.ebuild | 73 ----------------------------------------
 app-admin/pass/pass-1.7.1.ebuild |  2 +-
 3 files changed, 1 insertion(+), 75 deletions(-)

diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index f4214458cb6..281d8ce531f 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,2 +1 @@
-DIST password-store-1.6.5.tar.xz 54576 SHA256 337a39767e6a8e69b2bcc549f27ff3915efacea57e5334c6068fcb72331d7315 SHA512 e28503b63c6d18a2f45f4a732fdec0380c2ac15e1778136ec5e7ac568662b09183d3ad4fd36ca7e87cfe74540f916cb6365695bdf665a39da4cbe86c4bde7a78 WHIRLPOOL da5a5652d6fcea4f571135072f205cc7ad1aecb927478fde7979051557df958e9c51c47363c12f213deafbd7572eefe0f204acda7e430548e365f0e7fdc0c94f
 DIST password-store-1.7.1.tar.xz 62340 SHA256 f6d2199593398aaefeaa55e21daddfb7f1073e9e096af6d887126141e99d9869 SHA512 2ba2ebc80c90454bbab1da3c43c2cfc87135f838f381e2616eef7c36b0c1de01e491cf587a666bb052d6dfd475fa429bc8fd82b0269325bd2b70afbb897b923e WHIRLPOOL 34bcf6aecf7287313a47721b403664667001f4997be2f2f37114708cd64ea67af682176b6991c828802d71de306383f122a3668d388b8d9a68c1563dbb68bc46

diff --git a/app-admin/pass/pass-1.6.5.ebuild b/app-admin/pass/pass-1.6.5.ebuild
deleted file mode 100644
index a94a7f3217a..00000000000
--- a/app-admin/pass/pass-1.6.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 elisp-common
-
-DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
-HOMEPAGE="https://www.passwordstore.org/"
-SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
-
-RDEPEND="
-	app-crypt/gnupg
-	app-admin/pwgen
-	>=app-text/tree-1.7.0
-	git? ( dev-vcs/git )
-	X? ( x11-misc/xclip )
-	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
-	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/password-store-${PV}"
-
-src_prepare() {
-	use elibc_Darwin || return
-	# use coreutils'
-	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
-	# host getopt isn't cool, and we aren't brew (rip out brew reference)
-	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
-	# make sure we can find "mount"
-	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	use zsh-completion && export FORCE_ZSHCOMP=1
-	use fish-completion && export FORCE_FISHCOMP=1
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	use dmenu && dobin contrib/dmenu/passmenu
-	newbashcomp src/completion/pass.bash-completion pass
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.el
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	fi
-	if use importers; then
-		exeinto /usr/share/${PN}/importers
-		doexe contrib/importers/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use importers; then
-		einfo "To import passwords from other password managers, you may use the"
-		einfo "various importer scripts found in:"
-		einfo "    ${ROOT}usr/share/${PN}/importers/"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}

diff --git a/app-admin/pass/pass-1.7.1.ebuild b/app-admin/pass/pass-1.7.1.ebuild
index 519ef4f5244..627d9ebd3bb 100644
--- a/app-admin/pass/pass-1.7.1.ebuild
+++ b/app-admin/pass/pass-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="