summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/pass/ChangeLog6
-rw-r--r--app-admin/pass/Manifest34
-rw-r--r--app-admin/pass/metadata.xml37
-rw-r--r--app-admin/pass/pass-1.6.1-r1.ebuild13
-rw-r--r--app-admin/pass/pass-9999.ebuild13
5 files changed, 64 insertions, 39 deletions
diff --git a/app-admin/pass/ChangeLog b/app-admin/pass/ChangeLog
index 1b67a7bb6ed7..02aa44b34fe4 100644
--- a/app-admin/pass/ChangeLog
+++ b/app-admin/pass/ChangeLog
@@ -1,6 +1,10 @@
# 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.21 2014/05/09 11:48:09 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/ChangeLog,v 1.22 2014/05/09 12:10:53 zx2c4 Exp $
+
+ 09 May 2014; Jason A. Donenfeld <zx2c4@gentoo.org> metadata.xml,
+ pass-1.6.1-r1.ebuild, pass-9999.ebuild:
+ Install importers behind USE flag.
09 May 2014; Jason A. Donenfeld <zx2c4@gentoo.org> +files/50pass-gentoo.el,
pass-1.6.1-r1.ebuild, pass-9999.ebuild:
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index fa62e7d321dc..4214f2cfb152 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -3,24 +3,24 @@ Hash: SHA256
AUX 50pass-gentoo.el 491 SHA256 1420eb48a178553d6032ee312359fc498b1469d433537c4812dca2f835e5f9e7 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659 WHIRLPOOL 2030f49e6aaab66dbb507e3b49de371723de334b44afe568392f8fef7d0e0dd43238f636bf462d863de07ec5ff8eb84fd92d3479fe6243d487c2235aa3c5c699
DIST password-store-1.6.1.tar.xz 51096 SHA256 3c154d556c53c76b1a0ccacdc108c34f1fdb4a36fab28a6d2f42f02184290881 SHA512 11ceb1c7c0ab1b691c6d77f4f2402a4e10c68dd1057fadda6b70f1c56f68582edab820a581fb25fc3b8514ee9a2be7cd5438fa594189de705b10239b09df5cb3 WHIRLPOOL 705b173054bfa67d77474e522595a27e279e2c7c2d6f138d150934ae558cdc2a1f95d4420f3aa45e0148bd6443d6e207a526d44f627e9053bb1cf662ed7042f2
-EBUILD pass-1.6.1-r1.ebuild 1824 SHA256 7fddfe2af568b27a4069309ab8488eec30d06b0690c7f9b7d9792b5b34857738 SHA512 8f3fae70f35987856cce75b8d5c0c0ac99524899021514938b921e63b3e1dbcd74ba8255e2831102cbefbdce5800cdba65d1fdf3bee00a9ce9120f1ae1a82874 WHIRLPOOL 7c904a55f66f630302a95e32f81c4905798da137510c735c50bc2110cbc68ed981021dad4ab30fb86c433a2f716e4ae9258ef80174b49862186bce7864631c69
-EBUILD pass-9999.ebuild 1774 SHA256 8c9248b4a39eaa0c612adeb02fdf0c5851d07d0cd2fe4e5b64ac42aa4c9fe92b SHA512 25007a8747c1371d851c14d11be2458a1c64df1754091737f1eef840df164e064a8ceca4960492fc0a577a3cb2721320412989e63c19a819709569d532e378b9 WHIRLPOOL 39a2b5b464e630557500af53db276c703a08f354d361f0c4694e58cad5fe64b0de27ff4a2400491e3351977070f3f562c8d49158bad09f261a47c24b5c2a6d0e
-MISC ChangeLog 2854 SHA256 1c170c413d7286cbe5fdef664260350ca2ad5abe76dd0779e8f8ba3a2a17808f SHA512 3d39a8a2f272b9c0d8428a55f5f4cc69ffee9c58710bf509b213f2739a2715074c59d900069df113fe5f83ccb65e3e913287033f347d3f5d660d5e6055566a57 WHIRLPOOL 67c06367b5adcd889706c9caf4a7897b76a2f177b2b8f855745b74f2712e30efd2a1d4e36f6e04e8a1e63156436bb834484012bae672494954ad313a98fed801
-MISC metadata.xml 748 SHA256 2d991838a8e3f6beb1e8daaf555fd718a76c8099dfec9feff7e06e4a6c565f6b SHA512 f8743fca195e1bf16b93acfe11bfe0969aaf9de7ac842ef405067b4d109ddbf47a11fe9966d9066706ca21214f4b4c22055e96c72232e9607c3c32d818b8661a WHIRLPOOL 5bfb4040dee452285b62e1fefe301be2be7bfc1341707e20fc425b172f442f75f66ad653e623b088fc0e7355869d730ead8a3b071da458935cb78a3fc53ba2dd
+EBUILD pass-1.6.1-r1.ebuild 2124 SHA256 130fab9c4e5b28bcec2d21f4e0a18a774cdd119f3a6328156b09fd2b2b808f6b SHA512 1ffa26793dda638c13be94f12aa712725583a6c6809e01e518aadac96c78986b4ef74083a3048d3844b571c2e01466b399e3c362fe72e156b0ff97f6063f3698 WHIRLPOOL f12547776c48f72a2ba8c13e969b437f2b4772a1293b0dd8e0508d040f7105986cd7e9ac48ada7b134eaea16cbe61e791bdab2769ac47833f8831c795ec8f1f8
+EBUILD pass-9999.ebuild 2074 SHA256 da82d0ed7601eb2d0ee2813e0e5c0267920e8d873a67b863ad16cefe7035ad0b SHA512 481f46a968ab24c6c981c99fc3b3f3bd2e4ddaa393bccc24950fd8f2561632930e9bdad8660468f06ab4cfc19ada91d0d8e5ad70e21e1f71bd204c09557be2c5 WHIRLPOOL 19851a1addff73f987ccd4f5f0726b6bc420979ca80a2bb01afc9b4330fd3bc1c7d2e405dc95cacd7f4c6e3212dc86b76e475d64fdeea7cdf58003e86d918461
+MISC ChangeLog 3001 SHA256 d51935da39f5b337be5fa77c5d5c43ebb91fef13f3ae9de0590e42ce760fd080 SHA512 2b533201259f54f934e84c258059f1dc792137ec8047d3e17152d390018054ed862c6289c8bf12b349a6726201b8891206e25cf831a8dcc37d86fcfd1fd55181 WHIRLPOOL ea4ecbbef37ee43406194cc2d7a2a0700dbd2815a1b7457526f6c676e79b412a33372c6dc11f78c5c1b54e519e69fc2836e4ba9334abbd03fe90fc30915092cb
+MISC metadata.xml 867 SHA256 dee4a7d01bcf56ddc53605ce373b9e740f409d2e81d1ffd4b8bd0058cd13cccc SHA512 71d50d2288b8b7914c907a99e0ad1dfcc68c7a15c4c52fa560b382fa8f8fa05631174a8187370b67cdc1ebb7fb090e7740779ae087413007b326b67a712b413d WHIRLPOOL 52789415a5486956ff526e8d543cc0d32eb1d9290cb225c35dc021bde8099ed11df63b8c90fb7abe7df6618e8d3a78a113f85e9999e0963c30b64a18b0f5a23a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTbMDEAAoJEEn8cBKl3gOu8ToQAJRaPwo3xs9o2UwQ0c+V+lpF
-9Zy6i0f2xcIAAyvtygoRQD+ximFhi0HKlq8MC9d7KfyCEepjIHAz/9WXiY5iKZBQ
-qai6Yhh1kfp/gI7XAGxxgKVICBsqhnEwoqQZJjp82SWKaJkA3Oog4H9u8Ayz14/N
-11Hz3+5BS1+2eWlWC7tEZt6oBYosSwUHb/biRhx/A+0jtYOHPdSzpBaoDQHRNUFx
-mjcAxhbgZ2sANTHUXn/ahU1g4r0Isthp+yEEDDmPCSdce6byzAOYoeN3sx9NV0Fj
-3PTjmdMgxQ1FWhcii5rScJovGeGVqSPA+5TRAh5skLmCgSTQO8a+T+t0nd2QFCSG
-zaWu0Tc7Ow7hhU2egtDYJ7lxxA5g2r0hq7Ec0ABQyEVY+n+H8LVfkRzWMElOFFxw
-ssLV3Uu8s4OPIY/OluqbKiTvMm8G/Hk8vuwOR8YYMRwb5TO7MTc7LCOTLN9u2WoR
-QgnBcPG4jevDGTwY+43ga5gjWso+s4GBGbS2ZO+k8QWDmCRG1uoOFeIaJ08ohoWs
-uRFKI9oyicYzFfJ/o8RGqj1omBgVWNqloYFEVkkIsJop5vXi98Z7YvXAL2DZbS0R
-WmQeJYIIxo7n2d6aXH+57Qk1F8aGJJR8JgMAj0orazIzfuIT6DEezjxNxn9Gi54r
-N3CEOtyWuxtVjqpwuswc
-=MWJy
+iQIcBAEBCAAGBQJTbMYPAAoJEEn8cBKl3gOuMPUP/AyloSo5Ss6572Ci1tSjH43x
+CViBTqa5XwP5dnWk4K+JxVIpITFieQe837s/LmPQJxv0XgB+RS4fZsMSmibmaTRv
+OkfHBoIZdzWHz8svN6h+JD7AgzkRO6CIf5PZZoKRXT98efi/l0OCmP3Qiy3Plf5n
+nHiULP6HXJ5KczBEeYgrpnh0gxUYzYRTWfcC9YcCdSA7YWF52MfHWPMRZWIz9Oxc
+hWETfAGp4zUmRtvP4SKTWaoRGP/zHTrxS5TPg9CZkex8Hqflu4/Fqw5qulMQQrPC
+NLuxeJ5YYpERfsmY8Y0++H3MKTraA5XdqWExpijpcb4YuV2Wa1oEzV1T+RFRlGuq
+IW6PgGMdQLSRiOAGzxmrfbs720Y9QWLBxnZcMHXzC4Q27RPw97AXT4PVRgl+7SG3
+R8rCTGsd8hLu4d4jFSx17LDQuB/mhjzb/vD/ooauJiRbt8Hz6DMjjFUevXpx16Be
+YO5iZfRs4W0d2nPOZSvPP+d8z6Axa9w2c+UyaOmjRJENAZ1BXXO4az/Obnccyfoc
+NM3xsSM8ODgH17qBTq0kAvB42FQVNpBsAkTJCGsAzt+bWVtmSX8RJo2D258UCPEx
+QT5nBYWiNtENsUAWhmRuS482aBCjZnHMB/on+1zcppOJQnWFZpCfHseGT40APf1Q
+i1pNHJqK98O4/MacB/Oy
+=VDdK
-----END PGP SIGNATURE-----
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 872e5c9a8b28..0b30c4c8eeec 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -1,25 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>zx2c4@gentoo.org</email>
- <name>Jason A. Donenfeld</name>
- </maintainer>
- <longdescription>
+ <maintainer>
+ <email>zx2c4@gentoo.org</email>
+ <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <longdescription>
Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git.
- </longdescription>
- <use>
- <flag name="X">
+ </longdescription>
+ <use>
+ <flag name="X">
Use <pkg>x11-misc/xclip</pkg> to copy passwords to the clipboard.
- </flag>
- <flag name="git">
+ </flag>
+ <flag name="git">
Use <pkg>dev-vcs/git</pkg> for password revisions.
- </flag>
- <flag name="fish-completion">
+ </flag>
+ <flag name="fish-completion">
Enable fish completion support.
- </flag>
- <flag name="dmenu">
- Add support for x11-misc/dmenu with the 'passmenu' program.
- </flag>
- </use>
+ </flag>
+ <flag name="dmenu">
+ Add support for x11-misc/dmenu with the 'passmenu' program.
+ </flag>
+ <flag name="importers">
+ Allow importing passwords from other password managers using various contributed scripts.
+ </flag>
+ </use>
</pkgmetadata>
diff --git a/app-admin/pass/pass-1.6.1-r1.ebuild b/app-admin/pass/pass-1.6.1-r1.ebuild
index 6379978055a2..aacd5aa67e1b 100644
--- a/app-admin/pass/pass-1.6.1-r1.ebuild
+++ b/app-admin/pass/pass-1.6.1-r1.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-1.6.1-r1.ebuild,v 1.3 2014/05/09 11:48:09 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-1.6.1-r1.ebuild,v 1.4 2014/05/09 12:10:53 zx2c4 Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="http://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.x
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86 ~x86-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu elibc_Darwin"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
RDEPEND="
app-crypt/gnupg
@@ -54,10 +54,19 @@ src_install() {
elisp-install ${PN} contrib/emacs/*.el || die
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
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 " ${ROOT}usr/share/${PN}/importers/"
+ fi
}
pkg_postrm() {
diff --git a/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index 286579c996ee..135c23db4aaa 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.14 2014/05/09 11:48:09 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pass/pass-9999.ebuild,v 1.15 2014/05/09 12:10:53 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 emacs dmenu elibc_Darwin"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
RDEPEND="
app-crypt/gnupg
@@ -54,10 +54,19 @@ src_install() {
elisp-install ${PN} contrib/emacs/*.el || die
elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
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 " ${ROOT}usr/share/${PN}/importers/"
+ fi
}
pkg_postrm() {