diff options
| author |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2014-04-20 22:36:41 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <zx2c4@gentoo.org> | 2014-04-20 22:36:41 +0000 |
| commit | 94b0f0297a8f20e69e82306ea25ed0da67cb770c (patch) | |
| tree | 9ab0a1089d28769b3b3398307d8e0bd9d31d77e5 | |
| parent | Unbreak pango-querymodules postinst call for non-multilib case (bug #508278, ... (diff) | |
| download | gentoo-2-94b0f0297a8f20e69e82306ea25ed0da67cb770c.tar.gz gentoo-2-94b0f0297a8f20e69e82306ea25ed0da67cb770c.tar.bz2 gentoo-2-94b0f0297a8f20e69e82306ea25ed0da67cb770c.zip | |
Use upstream makefile.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)
| -rw-r--r-- | app-admin/pass/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/pass/pass-9999.ebuild | 27 |
2 files changed, 12 insertions, 20 deletions
diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog index 7d698773a2f3..8dd128db8c9b 100644 --- a/app-admin/pass/ChangeLog +++ b/app-admin/pass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/pass # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.9 2014/04/13 15:44:38 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.10 2014/04/20 22:36:41 zx2c4 Exp $ + + 20 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> pass-9999.ebuild: + Use upstream makefile. *pass-1.5 (13 Apr 2014) diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild index 69142bed9861..8b7d51007597 100644 --- a/app-admin/pass/pass-9999.ebuild +++ b/app-admin/pass/pass-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.5 2014/03/22 19:38:36 zx2c4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.6 2014/04/20 22:36:41 zx2c4 Exp $ EAPI=4 @@ -13,7 +13,7 @@ EGIT_REPO_URI="http://git.zx2c4.com/password-store" SLOT="0" LICENSE="GPL-2" KEYWORDS="" -IUSE="+git X zsh-completion fish-completion elibc_Darwin" +IUSE="+git X +bash-completion zsh-completion fish-completion elibc_Darwin" RDEPEND=" app-crypt/gnupg @@ -22,6 +22,7 @@ RDEPEND=" git? ( dev-vcs/git ) X? ( x11-misc/xclip ) elibc_Darwin? ( app-misc/getopt ) + bash-completion? ( app-shells/bash-completion ) zsh-completion? ( app-shells/zsh ) fish-completion? ( app-shells/fish ) " @@ -43,21 +44,9 @@ src_compile() { } src_install() { - newbin src/password-store.sh pass - doman man/pass.1 - dodoc README - newbashcomp src/completion/pass.bash-completion ${PN} - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - newins src/completion/pass.zsh-completion _pass - fi - if use fish-completion ; then - insinto /usr/share/fish/completions - newins src/completion/pass.fish-completion pass.fish - fi - if use elibc_Darwin ; then - insinto /usr/share/pass - newins src/platform/darwin.sh platform.sh - fi - + local COMPS=( ) + use bash-completion && COMPS+=( "FORCE_BASHCOMP=1" ) + use zsh-completion && COMPS+=( "FORCE_ZSHCOMP=1" ) + use fish-completion && COMPS+=( "FORCE_FISHCOMP=1" ) + emake DESTDIR="${D}" "${COMPS[@]}" install } |