commit:     ecf68b2f3f259007dc235b6278a3037128b7f85c
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 16:58:12 2021 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 17:01:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf68b2f

app-admin/pass: bump to 1.7.4

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 app-admin/pass/Manifest                               |  2 +-
 ...ass-1.7.4_pre20210216.ebuild => pass-1.7.4.ebuild} | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index dcd8486ea58..09d1fa94889 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,2 +1,2 @@
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 
5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3
 SHA512 
89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
-DIST password-store-918992c19231b33b3d4a3288a7288a620e608cb4.tar.xz 65000 
BLAKE2B 
2bd7768fe1a93ce55b0daf15088bde7ce75dbe33f44b1890e27ca6efe70fadb07610b830bd9926f6c88b33c4d3ae208b0035f13e81f28978cb26454332a19b13
 SHA512 
63a448e4da3da60d3dfe02b02eb11417e179c4f0b973c822bfbb485262076ae7458c3e35e95b2ad9997a2ddfa8bbe91a822c86d7ad5d2f7a6e6cb90d11774aa9
+DIST password-store-1.7.4.tar.xz 65272 BLAKE2B 
db1a34b5900802731deaf09d3ade1d3f00022fd21eb0b21140dca3d399c89183dc901e5bce15d7bb6041e62017e2b8b6df61c6ec3eadb1df6c0278dbc6c2bc11
 SHA512 
1fe108895b224451b54e545d399b6a97040e094049448509f92ae33164a5cf9044a91f52edfc705fcf333f6526df1a478deeebc4df109764d58100f9e3e22681

diff --git a/app-admin/pass/pass-1.7.4_pre20210216.ebuild 
b/app-admin/pass/pass-1.7.4.ebuild
similarity index 81%
rename from app-admin/pass/pass-1.7.4_pre20210216.ebuild
rename to app-admin/pass/pass-1.7.4.ebuild
index 6fa4fa9340c..d1349cc2976 100644
--- a/app-admin/pass/pass-1.7.4_pre20210216.ebuild
+++ b/app-admin/pass/pass-1.7.4.ebuild
@@ -5,21 +5,13 @@ EAPI=7
 
 inherit bash-completion-r1 elisp-common
 
-if [[ ${PV} = 9999* ]]; then
-       EGIT_REPO_URI="https://git.zx2c4.com/password-store";
-       inherit git-r3
-else
-       KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-       COMMIT_ID="918992c19231b33b3d4a3288a7288a620e608cb4"
-       
SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${COMMIT_ID}.tar.xz";
-       S="${WORKDIR}/${PN}"
-fi
-
 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 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers 
elibc_Darwin"
 
 RDEPEND="
@@ -36,12 +28,7 @@ RDEPEND="
        emacs? ( >=app-editors/emacs-23.1:* >=app-emacs/f-0.11.0 
>=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
 "
 
-src_unpack() {
-       default
-
-       # Hack: Tests fail if the path length is too long
-       mv "${WORKDIR}/password-store-${COMMIT_ID}" "${WORKDIR}/${PN}"
-}
+S="${WORKDIR}/password-store-${PV}"
 
 src_prepare() {
        default

Reply via email to