Install importers behind USE flag.

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

4 files changed, 47 insertions, 22 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/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() {