gentoo resync : 28.04.2021

3 files changed, 98 insertions, 3 deletions

diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index e911eb65212a..c85f0c0bb161 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,7 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
+DIST password-store-918992c19231b33b3d4a3288a7288a620e608cb4.tar.xz 65000 BLAKE2B 2bd7768fe1a93ce55b0daf15088bde7ce75dbe33f44b1890e27ca6efe70fadb07610b830bd9926f6c88b33c4d3ae208b0035f13e81f28978cb26454332a19b13 SHA512 63a448e4da3da60d3dfe02b02eb11417e179c4f0b973c822bfbb485262076ae7458c3e35e95b2ad9997a2ddfa8bbe91a822c86d7ad5d2f7a6e6cb90d11774aa9
 EBUILD pass-1.7.3.ebuild 2200 BLAKE2B 29b614496070c995983bf8ebb44bd02ac8f8ed53161c814adb69cad95fe74667e869f106d51aefe26cd449a08f464cfec88315c24d3e7996ba8f1d44fc8604b5 SHA512 18dc94bdc0d786377791b99a36e3f1eb10f518874290623638cf4ab65cda3bdad7ac6875b37c15cae7dda5fa84f08204b5a64bd3c2de2a4e3b9e885fcfe3d0f5
-EBUILD pass-9999.ebuild 2300 BLAKE2B 9d002c0e8807479e45ad2c945f9c5c3976cb6ca4cc18e78cfa0c1d0f5c8025643579d56ba4eb6cc33690b92f33bba0cf7a9f0004c24de911bd37cfc423dc2ed4 SHA512 87a0d7170f0e6029fd1f80b0b001ca76598415cd0dbf488f5c2341c72ca49e4b37ec668999224d3976ca1ec8aed7a04487172d05277b0d5330149dbe8cb976b3
+EBUILD pass-1.7.4_pre20210216.ebuild 2544 BLAKE2B 047064e6b7036756fb5b706ec4bfb0f917281da0e8a3bab77ed93a30419148945926bbf5a7a2afaa0ca1fc5544f4e804949c6cfc6f08bb9532b44f0abbee3253 SHA512 94ad2639d4adf9bce028b38ad94de817bb5b54287ff2b3298df46b24965ebf7ffd0e4558b7377b5b1674c45efbb5d1d246fcf9a07ad87a0446f0323cf76189fd
+EBUILD pass-9999.ebuild 2355 BLAKE2B 8dd1aee24e20485c9efef65d1e869d93556f1bd0eed7e2af81b3d5ff9ba8cdc7968a6c3ca8f12faf921cf91b558a4e94c4eb2ec84755fea8ae459de271a5784a SHA512 3a14b4d54b6d64968d262151b81e0efc3b5e7aeaa8ad8d01df1f10f37b40c069db68a3dfae0c84f369975cca10b19df1b3893fa37d39b6aa02dfde87fa167102
 MISC metadata.xml 747 BLAKE2B 0fa61ff5f87f66214e11c38fe1dd0dc746b8151bc201c72d972ddbd0f8e32dc89701798746df8e2c912eb0d4ccf43fc91d857dfc5395d184f4da24d5128f7b13 SHA512 5fb903b4d06cd49dea554f2a94bbd79e544840e4cce4e876b12eeaceb45aa6321a3fe50f1d531fdeb9cbd34dab66b2bf3ac0be52b07edaf62acf69a892c96200
diff --git a/app-admin/pass/pass-1.7.4_pre20210216.ebuild b/app-admin/pass/pass-1.7.4_pre20210216.ebuild
new file mode 100644
index 000000000000..6fa4fa9340ca
--- /dev/null
+++ b/app-admin/pass/pass-1.7.4_pre20210216.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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/"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	wayland? ( gui-apps/wl-clipboard )
+	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? ( >=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}"
+}
+
+src_prepare() {
+	default
+
+	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() {
+	use emacs && elisp-compile contrib/emacs/*.el
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=$(usex zsh-completion) \
+		WITH_FISHCOMP=$(usex fish-completion)
+	use dmenu && dobin contrib/dmenu/passmenu
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.{el,elc}
+		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 "    ${EROOT}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 41d248d350e1..a6ee842f8175 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 	S="${WORKDIR}/password-store-${PV}"
 fi
 
@@ -19,13 +19,14 @@ HOMEPAGE="https://www.passwordstore.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+IUSE="+git wayland X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
 	app-crypt/gnupg
 	media-gfx/qrencode
 	>=app-text/tree-1.7.0
 	git? ( dev-vcs/git )
+	wayland? ( gui-apps/wl-clipboard )
 	X? ( x11-misc/xclip )
 	elibc_Darwin? ( app-misc/getopt )
 	zsh-completion? ( app-shells/gentoo-zsh-completions )