| 1 |
commit: 7f3bc141b6d8d8ec2938d70f1eff7fd9958e42dc |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 2 00:00:52 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 2 00:12:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3bc141 |
| 7 |
|
| 8 |
app-admin/pass: Port to EAPI=7 |
| 9 |
|
| 10 |
Mostly propagating changes from v1.7.3 to v9999, but also consolidate |
| 11 |
the logic between live and non-live versions. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/pass/pass-9999.ebuild | 25 +++++++++++++++++-------- |
| 16 |
1 file changed, 17 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild |
| 19 |
index 9f608261287..f22353197ff 100644 |
| 20 |
--- a/app-admin/pass/pass-9999.ebuild |
| 21 |
+++ b/app-admin/pass/pass-9999.ebuild |
| 22 |
@@ -1,17 +1,24 @@ |
| 23 |
-# Copyright 1999-2019 Gentoo Authors |
| 24 |
+# Copyright 1999-2021 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=5 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit bash-completion-r1 git-r3 elisp-common |
| 31 |
+inherit bash-completion-r1 elisp-common |
| 32 |
+ |
| 33 |
+if [[ ${PV} = 9999* ]]; then |
| 34 |
+ EGIT_REPO_URI="https://git.zx2c4.com/password-store" |
| 35 |
+ inherit git-r3 |
| 36 |
+else |
| 37 |
+ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz" |
| 38 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 39 |
+ S="${WORKDIR}/password-store-${PV}" |
| 40 |
+fi |
| 41 |
|
| 42 |
DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely" |
| 43 |
HOMEPAGE="https://www.passwordstore.org/" |
| 44 |
-EGIT_REPO_URI="https://git.zx2c4.com/password-store" |
| 45 |
|
| 46 |
SLOT="0" |
| 47 |
LICENSE="GPL-2" |
| 48 |
-KEYWORDS="" |
| 49 |
IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin" |
| 50 |
|
| 51 |
RDEPEND=" |
| 52 |
@@ -24,10 +31,12 @@ RDEPEND=" |
| 53 |
zsh-completion? ( app-shells/gentoo-zsh-completions ) |
| 54 |
fish-completion? ( app-shells/fish ) |
| 55 |
dmenu? ( x11-misc/dmenu x11-misc/xdotool ) |
| 56 |
- emacs? ( >=app-editors/emacs-23.1:* ) |
| 57 |
+ 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 ) |
| 58 |
" |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
+ default |
| 62 |
+ |
| 63 |
use elibc_Darwin || return |
| 64 |
# use coreutils' |
| 65 |
sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die |
| 66 |
@@ -38,7 +47,7 @@ src_prepare() { |
| 67 |
} |
| 68 |
|
| 69 |
src_compile() { |
| 70 |
- :; |
| 71 |
+ use emacs && elisp-compile contrib/emacs/*.el |
| 72 |
} |
| 73 |
|
| 74 |
src_install() { |
| 75 |
@@ -51,7 +60,7 @@ src_install() { |
| 76 |
WITH_FISHCOMP=$(usex fish-completion) |
| 77 |
use dmenu && dobin contrib/dmenu/passmenu |
| 78 |
if use emacs; then |
| 79 |
- elisp-install ${PN} contrib/emacs/*.el |
| 80 |
+ elisp-install ${PN} contrib/emacs/*.{el,elc} |
| 81 |
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" |
| 82 |
fi |
| 83 |
if use importers; then |
Archives