Version bump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

3 files changed, 65 insertions, 7 deletions

diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog
index aa669be56f73..12e650c48115 100644
--- a/app-admin/pass/ChangeLog
+++ b/app-admin/pass/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2014/04/24 09:21:50 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.15 2014/04/24 16:38:48 zx2c4 Exp $
+
+*pass-1.6 (24 Apr 2014)
+
+  24 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +pass-1.6.ebuild,
+  pass-9999.ebuild:
+  Version bump
 
   24 Apr 2014; Jason A. Donenfeld <zx2c4@gentoo.org> metadata.xml,
   pass-9999.ebuild:
diff --git a/app-admin/pass/pass-1.6.ebuild b/app-admin/pass/pass-1.6.ebuild
new file mode 100644
index 000000000000..f3389ab20f20
--- /dev/null
+++ b/app-admin/pass/pass-1.6.ebuild
@@ -0,0 +1,53 @@
+# 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-1.6.ebuild,v 1.1 2014/04/24 16:38:48 zx2c4 Exp $
+
+EAPI=4
+
+inherit bash-completion-r1
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git"
+HOMEPAGE="http://zx2c4.com/projects/password-store/"
+SRC_URI="http://git.zx2c4.com/password-store/snapshot/password-store-1.6.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE="+git X +bash-completion zsh-completion fish-completion dmenu 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 )
+	bash-completion? ( app-shells/bash-completion )
+	zsh-completion? ( app-shells/zsh )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu )
+"
+
+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 bash-completion && export FORCE_BASHCOMP=1
+	use zsh-completion && export FORCE_ZSHCOMP=1
+	use fish-completion && export FORCE_FISHCOMP=1
+	default
+	use dmenu && dobin contrib/dmenu/passmenu
+}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 960ebedcc91b..76020b60d304 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.10 2014/04/24 09:21:50 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.11 2014/04/24 16:38:47 zx2c4 Exp $
 
 EAPI=4
 
@@ -45,10 +45,9 @@ src_compile() {
 }
 
 src_install() {
-	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
+	use bash-completion && export FORCE_BASHCOMP=1
+	use zsh-completion && export FORCE_ZSHCOMP=1
+	use fish-completion && export FORCE_FISHCOMP=1
+	default
 	use dmenu && dobin contrib/dmenu/passmenu
 }